diff options
| author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
| commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
| tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /configure.ac | |
| parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
| parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
| download | plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip | |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'configure.ac')
| -rwxr-xr-x | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 1cf9a1de3..7f3a3f6fe 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.11.27], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.2.1.22], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS |