diff options
| author | Patrick Ohly <patrick.ohly@intel.com> | 2011-10-10 10:06:29 +0200 |
|---|---|---|
| committer | Patrick Ohly <patrick.ohly@intel.com> | 2011-10-10 10:06:29 +0200 |
| commit | 2b1065792a3c3340f4f7e5a49e832f4d8f2f0949 (patch) | |
| tree | 51217f905e6ec475a3f76fe1c2fc03cacf1f65ea | |
| parent | ee004f7856652835051ec3a41a093a8a335cab5c (diff) | |
autotools: bumped version to 3.4.0.16.3
Added "newest wins" for add<->add conflict.
| -rw-r--r-- | configure.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.in b/configure.in index c3259ad..b3458ac 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ AC_INIT(src/sysync/engineinterface.cpp) AC_CONFIG_MACRO_DIR([m4]) # four digit upstream version, one additional digit for # Linux/SyncEvolution specific extensions: -AM_INIT_AUTOMAKE(synthesis, 3.4.0.16.2) +AM_INIT_AUTOMAKE(synthesis, 3.4.0.16.3) AM_CONFIG_HEADER(config.h) AC_LIBTOOL_DLOPEN |