summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-02-26 03:49:24 +0100
committerDan McGee <dan@archlinux.org>2008-02-26 03:49:59 +0100
commitd75f693155c3d7e595a779f15beea516d321f228 (patch)
tree831fe39a8f8193adb9682cd3d7ff1eff4f4eb938 /configure.ac
parentf159203f6fb217bb7bed5ffea8c2518325a9ec12 (diff)
parent8efe0ecb250050e9061854476468298afb5944d2 (diff)
downloadpacman-d75f693155c3d7e595a779f15beea516d321f228.tar.gz
pacman-d75f693155c3d7e595a779f15beea516d321f228.tar.xz
Merge branch 'maint'
Also bump the devel version on the master branch to 3.2.0devel.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 0b7769dc..ad051435 100644
--- a/configure.ac
+++ b/configure.ac
@@ -51,9 +51,9 @@ m4_define([lib_revision], [0])
m4_define([lib_age], [2])
m4_define([pacman_version_major], [3])
-m4_define([pacman_version_minor], [1])
-m4_define([pacman_version_micro], [2])
-m4_define([pacman_version_suffix], [])
+m4_define([pacman_version_minor], [2])
+m4_define([pacman_version_micro], [0])
+m4_define([pacman_version_suffix], [devel])
m4_define([pacman_version],
[pacman_version_major.pacman_version_minor.pacman_version_micro])
m4_define([pacman_display_version],