TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3474 commits 2 branches 28 tags 122 MiB
C++ 89.7%
C 5.5%
Python 4.1%
Shell 0.4%
Roff 0.2%
Go to file
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
common Merge branch d2x-rebirth into unification/master 2013-04-21 04:52:22 +00:00
d1x-rebirth Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
d2x-rebirth Merge branch d2x-rebirth into unification/master 2013-04-21 04:52:22 +00:00
similar Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00
.gitignore Added .gitignore 2013-04-06 11:48:26 +08:00
SConstruct Merge branch d1x-rebirth into unification/master 2013-04-21 04:51:35 +00:00