summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-08-11 11:32:09 -0500
committerDan McGee <dan@archlinux.org>2011-08-11 11:35:29 -0500
commitdd865d298146ef77effb2110d7db172b3bffe9b0 (patch)
treec77aca742e8e88a3e00100e784d076ca5f281308 /configure.ac
parentd0c64c41965d49ac840a747d009de85b7eb9e92e (diff)
parentc493eef643ecb3a54c79083c51a8975f816ed9de (diff)
downloadpacman-dd865d298146ef77effb2110d7db172b3bffe9b0.tar.xz
Merge branch 'maint'
Conflicts: scripts/repo-add.sh.in
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 309a591a..247c5318 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], [3])
+m4_define([lib_revision], [4])
m4_define([lib_age], [0])
m4_define([pacman_version_major], [3])
m4_define([pacman_version_minor], [5])
-m4_define([pacman_version_micro], [3])
+m4_define([pacman_version_micro], [4])
m4_define([pacman_version],
[pacman_version_major.pacman_version_minor.pacman_version_micro])