diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
| commit | fc99167e687ba688ce9306bbec7e801450c917be (patch) | |
| tree | b440f2568a98b4b6a8db17925a299142adead7fa /src/game/version.h | |
| parent | 206e9adb9140c3c8963661f534703de33f8abe05 (diff) | |
| parent | 44a47d4253a829abcf50dac5586fd9a351f0c66b (diff) | |
| download | zcatch-fc99167e687ba688ce9306bbec7e801450c917be.tar.gz zcatch-fc99167e687ba688ce9306bbec7e801450c917be.zip | |
Merge branch 'master' into zCatch-Exp
Conflicts: src/engine/server.h src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/network.h src/engine/shared/network_server.cpp src/game/server/player.h
Diffstat (limited to 'src/game/version.h')
| -rw-r--r-- | src/game/version.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/game/version.h b/src/game/version.h index 76b6d4ab..3d909e36 100644 --- a/src/game/version.h +++ b/src/game/version.h @@ -3,6 +3,7 @@ #ifndef GAME_VERSION_H #define GAME_VERSION_H #include "generated/nethash.cpp" -#define GAME_VERSION "0.6.1" +#define GAME_VERSION "0.6 trunk" #define GAME_NETVERSION "0.6 " GAME_NETVERSION_HASH +static const char GAME_RELEASE_VERSION[8] = {'0', '.', '6', '1', 0}; #endif |