diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 02:20:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 02:20:02 +0100 |
| commit | dcd890bd46a158ed42e025f5687c18d9b37097d8 (patch) | |
| tree | 4d62cd2a236a9fe7366b6ffb5d9119e0e1755262 /source4 | |
| parent | 08e3f99f14f178e87f3543261be59a7f97f60b4f (diff) | |
| parent | 3cfac63d165f072464e93a12f7ad48450c66477b (diff) | |
| download | samba-dcd890bd46a158ed42e025f5687c18d9b37097d8.tar.gz samba-dcd890bd46a158ed42e025f5687c18d9b37097d8.tar.bz2 samba-dcd890bd46a158ed42e025f5687c18d9b37097d8.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
(This used to be commit 1a8f5ab78ae24607ff66b06e82aef9316f0ae54b)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/lib/talloc/config.mk | 2 | ||||
| -rw-r--r-- | source4/lib/talloc/configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 9e949f900f..540a05d100 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,5 +1,5 @@ [LIBRARY::LIBTALLOC] -VERSION = 1.1.0 +VERSION = 1.2.0 SO_VERSION = 1 OBJ_FILES = talloc.o PC_FILE = talloc.pc diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 7878d59300..4719aa04b5 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc, 1.1.0) +AC_INIT(talloc, 1.2.0) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) |