diff options
| author | Dan McGee <dan@archlinux.org> | 2012-02-13 17:12:39 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-02-13 17:14:06 +0100 |
| commit | c7321a7b80aebeacb05ad5ab9d096779403b1758 (patch) | |
| tree | 8fa7f16abc7b7af0c24ba92ababfc5c145d35eed /configure.ac | |
| parent | 115c0381c235100d7b05d9751767017a9ee325c4 (diff) | |
| parent | b4f5a63e7fee5d04949e290bd63e5f0e94bd211e (diff) | |
| download | pacman-c7321a7b80aebeacb05ad5ab9d096779403b1758.tar.gz pacman-c7321a7b80aebeacb05ad5ab9d096779403b1758.tar.xz | |
Merge branch 'maint'
Conflicts:
lib/libalpm/sync.c
src/util/pactree.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 5b54ee9c..cfd3340f 100644 --- a/configure.ac +++ b/configure.ac @@ -42,12 +42,12 @@ AC_PREREQ(2.62) # pacman_version_micro += 1 m4_define([lib_current], [7]) -m4_define([lib_revision], [1]) +m4_define([lib_revision], [2]) m4_define([lib_age], [0]) m4_define([pacman_version_major], [4]) m4_define([pacman_version_minor], [0]) -m4_define([pacman_version_micro], [1]) +m4_define([pacman_version_micro], [2]) m4_define([pacman_version], [pacman_version_major.pacman_version_minor.pacman_version_micro]) |