diff options
author | Dan McGee <dan@archlinux.org> | 2011-06-03 00:33:56 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-06-03 00:34:12 +0200 |
commit | 9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9 (patch) | |
tree | b108af2fb331391498e1260103d6d6caaf01154c /configure.ac | |
parent | 8f30e1b110e5c7bf2ec3eb397fe6880a2c8ee0a9 (diff) | |
parent | 1744fe12d4b29eff681995441c9565403348aaa2 (diff) | |
download | pacman-9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9.tar.gz pacman-9d73b261cf1bbe8db0b176aeb6a40eb9df61d1e9.tar.xz |
Merge branch 'maint'
Conflicts:
src/pacman/callback.c
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 02f9f40c..12f36be6 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,12 @@ AC_PREREQ(2.62) # pacman_version_micro += 1 m4_define([lib_current], [6]) -m4_define([lib_revision], [2]) +m4_define([lib_revision], [3]) m4_define([lib_age], [0]) m4_define([pacman_version_major], [3]) m4_define([pacman_version_minor], [5]) -m4_define([pacman_version_micro], [2]) +m4_define([pacman_version_micro], [3]) m4_define([pacman_version], [pacman_version_major.pacman_version_minor.pacman_version_micro]) |