diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-02 18:57:10 +0300 |
| commit | f1e92aca00a4859047e83fab76220767b9a2f814 (patch) | |
| tree | 8aaa9d6853c6a8e0e8fc568c6f981cbd889b0cc3 /src/main.h | |
| parent | 70b520b1e876f9698bb95baa2d274ea289a0c6bd (diff) | |
| parent | 99771a1fb50286fdb0b511f425312503e657eddc (diff) | |
| download | manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.gz manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.bz2 manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.tar.xz manaplus-f1e92aca00a4859047e83fab76220767b9a2f814.zip | |
Merge branch 'master' into strippedstripped1.1.10.2
Conflicts:
packaging/debian/watch
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 0348d2700..95a1b1698 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.9.18" -#define CHECK_VERSION "01.01.09.18" +#define SMALL_VERSION "1.1.10.2" +#define CHECK_VERSION "01.01.10.02" #define PACKAGE_EXTENDED_VERSION "ManaPlus (" PACKAGE_OS \ |