mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-20 09:34:19 +00:00
Fixed merge conflict
This commit is contained in:
parent
b6548aa8cf
commit
6a9406dc81
|
@ -108,7 +108,7 @@ enum
|
||||||
VERSION_DDNET_HOOKDURATION_TUNE = 607,
|
VERSION_DDNET_HOOKDURATION_TUNE = 607,
|
||||||
VERSION_DDNET_FIREDELAY_TUNE = 701,
|
VERSION_DDNET_FIREDELAY_TUNE = 701,
|
||||||
VERSION_DDNET_UPDATER_FIXED = 707,
|
VERSION_DDNET_UPDATER_FIXED = 707,
|
||||||
VERSION_DDNET_GAMETICK = 10036,
|
VERSION_DDNET_GAMETICK = 10041,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
#ifndef GAME_VERSION_H
|
#ifndef GAME_VERSION_H
|
||||||
#define GAME_VERSION_H
|
#define GAME_VERSION_H
|
||||||
#include "generated/nethash.cpp"
|
#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"
|
#define GAME_NETVERSION "0.6 626fce9a778df4d4"
|
||||||
static const char GAME_RELEASE_VERSION[8] = "10.4";
|
static const char GAME_RELEASE_VERSION[8] = "10.4.1";
|
||||||
#define CLIENT_VERSIONNR 10040
|
#define CLIENT_VERSIONNR 10041
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue