Commit graph

3 commits

Author SHA1 Message Date
Kp bca0dacc98 Merge branch d2x-rebirth/master into unification/master
Conflicts:
	SConstruct
2013-08-09 22:53:45 +00:00
Kp a842e15d94 Merge branch d2x-rebirth into unification/master
Conflicts:
	SConstruct
	common/include/editor/ehostage.h
	common/main/cntrlcen.h
	common/main/laser.h
	common/main/mission.h
	common/main/net_udp.h
	common/main/object.h
	main/vers_id.h
	similar/editor/kfuncs.c
	similar/main/inferno.c
	similar/main/lighting.c
	similar/main/multibot.c
	similar/main/newmenu.c
	similar/main/physics.c
2013-04-21 04:52:22 +00:00
Kp 7cda97cc74 Move d2x-rebirth source into subdirectory d2x-rebirth 2013-02-19 00:34:46 +00:00