TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
3244 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 a4277df58f Merge branch 'unify-d2x-rebirth' into unify 
Conflicts:
	SConstruct
	common/include/editor/editor.h
	d2x-rebirth/editor/ehostage.c
	d2x-rebirth/include/d_glob.h
	d2x-rebirth/include/d_io.h
	d2x-rebirth/main/desc_id.h
	d2x-rebirth/main/gamestat.h
	d2x-rebirth/main/link.bat
2013-03-31 17:24:44 +00:00
common Merge branch 'unify-d2x-rebirth' into unify 2013-03-31 17:24:44 +00:00
d1x-rebirth Merge branch 'unify-d1x-rebirth' into unify 2013-03-31 17:21:59 +00:00
d2x-rebirth Merge branch 'unify-d2x-rebirth' into unify 2013-03-31 17:24:44 +00:00
similar Merge branch 'unify-d2x-rebirth' into unify 2013-03-31 17:24:44 +00:00
SConstruct Merge branch 'unify-d2x-rebirth' into unify 2013-03-31 17:24:44 +00:00