diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-04 20:05:48 +0300 |
| commit | 62ec17f6e489ec50f17219444468aeb8969dc961 (patch) | |
| tree | 350d7edb5c26c282a4e1906544536d68831228ac /configure.ac | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.gz manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.bz2 manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.tar.xz manaplus-62ec17f6e489ec50f17219444468aeb8969dc961.zip | |
Merge branch 'master' into strippedstripped1.1.9.4
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/guichan/basiccontainer.cpp
src/guichan/include/guichan/basiccontainer.hpp
src/guichan/widgets/window.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 72db9ed34..03d5cfd9e 100755 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.59) -AC_INIT([ManaPlus], [1.1.8.21], [akaras@inbox.ru], [manaplus]) +AC_INIT([ManaPlus], [1.1.9.4], [akaras@inbox.ru], [manaplus]) AM_INIT_AUTOMAKE([1.9]) AC_CONFIG_HEADERS([config.h:config.h.in]) AC_LANG_CPLUSPLUS |