diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/main.h | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | plus-stripped1.1.10.16.tar.gz plus-stripped1.1.10.16.tar.bz2 plus-stripped1.1.10.16.tar.xz plus-stripped1.1.10.16.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main.h b/src/main.h index 95a1b1698..548c3283f 100644 --- a/src/main.h +++ b/src/main.h @@ -45,12 +45,15 @@ * different interfaces, which have different implementations for each server. */ +#define SMALL_VERSION "1.1.10.16" +#define CHECK_VERSION "01.01.10.16" + #ifdef HAVE_CONFIG_H #include "../config.h" #elif defined WIN32 #include "winver.h" -#elif defined __APPLE__ -#define PACKAGE_VERSION "1.0.0" +#else +#define PACKAGE_VERSION SMALL_VERSION #endif #if defined __APPLE__ @@ -85,10 +88,6 @@ //define DEBUG_ALPHA_CACHE 1 //define DEBUG_OPENGL_LEAKS 1 -#define SMALL_VERSION "1.1.10.2" -#define CHECK_VERSION "01.01.10.02" - - #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ "; %s; 4144 v" SMALL_VERSION ")" #define PACKAGE_VERSION_4144 "ManaPlus 4144-" SMALL_VERSION "" |