edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 01:24:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflict

Browse source
This commit is contained in:
necropotame 2017-02-27 23:22:00 +01:00
parent b6548aa8cf
commit 6a9406dc81
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/shared/protocol.h
View file

@ -108,7 +108,7 @@ enum
VERSION_DDNET_HOOKDURATION_TUNE = 607,
VERSION_DDNET_FIREDELAY_TUNE = 701,
VERSION_DDNET_UPDATER_FIXED = 707,
VERSION_DDNET_GAMETICK = 10036,
VERSION_DDNET_GAMETICK = 10041,
};
#endif

6
src/game/version.h
View file

@ -3,8 +3,8 @@
#ifndef GAME_VERSION_H
#define GAME_VERSION_H
#include "generated/nethash.cpp"
#define GAME_VERSION "0.6.3, 10.4"
#define GAME_VERSION "0.6.3, 10.4.1"
#define GAME_NETVERSION "0.6 626fce9a778df4d4"
static const char GAME_RELEASE_VERSION[8] = "10.4";
#define CLIENT_VERSIONNR 10040
static const char GAME_RELEASE_VERSION[8] = "10.4.1";
#define CLIENT_VERSIONNR 10041
#endif