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 /src/main.h | |
| parent | 71d924d7dcdac067f02a317e9353ee067dbd0bde (diff) | |
| parent | fd484fc70fca32ff9065b91c175089b65aa3fd26 (diff) | |
| download | mv-stripped1.1.9.4.tar.gz mv-stripped1.1.9.4.tar.bz2 mv-stripped1.1.9.4.tar.xz mv-stripped1.1.9.4.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 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main.h b/src/main.h index 9f8bbc6ac..f8b6d97ba 100644 --- a/src/main.h +++ b/src/main.h @@ -85,8 +85,8 @@ //define DEBUG_ALPHA_CACHE 1 //define DEBUG_OPENGL_LEAKS 1 -#define SMALL_VERSION "1.1.8.21" -#define CHECK_VERSION "01.01.08.21" +#define SMALL_VERSION "1.1.9.4" +#define CHECK_VERSION "01.01.09.04" #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ |