Kp 33aa8937d9 Merge branch d1x-rebirth/master into unification/master ... Conflicts: SConstruct common/main/multi.h similar/main/gamerend.c		2013-08-09 22:49:04 +00:00
..
conf.h	Merge branch d1x-rebirth/master into unification/master	2013-08-09 22:49:04 +00:00
descent.r	Move d1x-rebirth source into subdirectory d1x-rebirth	2013-02-19 00:34:46 +00:00
messagebox.c	Mark various parameters and variables as const	2013-07-20 23:12:24 +00:00
SDL_main.c	Merge branch 'd2x-rebirth/master' into unification/master	2013-07-21 21:34:46 +00:00