ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2025-04-15 18:41:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/UberGames/RPG-X2.git

Browse source 
Conflicts:
	game/bg_public.h
This commit is contained in:
Harry Young 2011-12-12 19:40:09 +01:00
commit c9372420c6
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
game/bg_public.h
View file

@ -10,7 +10,11 @@
// because games can change separately from the main system version, we need a
// second version that must match between game and cgame
<<<<<<< HEAD
#define RPGX_VERSION "2.2 Beta wc12122011a"
=======
#define RPGX_VERSION "2.2 Beta wc121211a"
>>>>>>> origin/master
#define RPGX_COMPILEDATE "20/05/11"
#define RPGX_COMPILEDBY "GSIO01"
//const char GAME_VERSION[] = strcat("RPG-X v",RPGX_VERSION);

2
qcommon/stv_version.h
View file

@ -1,5 +1,5 @@
// Current version of holomatch game
#define Q3_VERSION "RPG-X v2.2 Beta 8.4.7 wc1"
#define Q3_VERSION "RPG-X v2.2 wc121211a"
// end