Commit graph

5 commits

Author SHA1 Message Date
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
Kp 4577dd3977 Merge branch 'd2x-rebirth/master' into unification/master 2013-07-21 21:34:46 +00:00
Kp 177e500893 Fix sign mismatch in control_center_triggers_swap 2013-07-19 02:50:49 +00:00
Kp 88208fc228 Merge branch d1x-rebirth/master into unification/master
Conflicts:
	SConstruct
	d1x-rebirth/main/multi.c
	similar/main/cntrlcen.c
	similar/main/wall.c
2013-06-14 03:18:32 +00:00
Kp 1e0f0c8f1b Move */main/cntrlcen.c -> similar/main/cntrlcen.c 2013-03-03 01:03:33 +00:00
Renamed from d2x-rebirth/main/cntrlcen.c (Browse further)