TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
dxx-rebirth/common/main
History
Kp 5c5618f671 Merge branch 'unify-d1x-rebirth' into unify 
Conflicts:
	SConstruct
	common/main/vers_id.h
	d1x-rebirth/include/alloca.h
	d1x-rebirth/include/bcd.h
	d1x-rebirth/include/clipboard.h
	d1x-rebirth/include/compare.h
	d1x-rebirth/include/tracker/tracker.h
	d1x-rebirth/main/desc_id.h
	d1x-rebirth/main/script.h
2013-03-31 17:21:59 +00:00
..
config.h Move */main/config.h -> common/main/config.h 2013-03-03 01:03:33 +00:00
digi.h Move */main/digi.h -> common/main/digi.h 2013-03-17 23:01:31 +00:00
gamefont.h Move */main/gamefont.h -> common/main/gamefont.h 2013-03-03 01:03:33 +00:00
hudmsg.h
inferno.h
lighting.h Move */main/lighting.h -> common/main/lighting.h 2013-03-03 01:03:33 +00:00
morph.h
piggy.h Move */main/piggy.h -> common/main/piggy.h 2013-03-17 23:01:31 +00:00
render.h Move */texmap/*.c -> common/texmap 2013-03-17 23:01:32 +00:00
slew.h
songs.h Move */main/songs.h -> common/main/songs.h 2013-03-17 23:01:30 +00:00
sounds.h Move */main/sounds.h -> common/main/sounds.h 2013-03-17 23:01:31 +00:00
textures.h Move */main/textures.h -> common/main/textures.h 2013-03-17 23:01:31 +00:00
vclip.h Move */main/vclip.h -> common/main/vclip.h 2013-03-17 23:01:31 +00:00
vers_id.h Merge branch 'unify-d1x-rebirth' into unify 2013-03-31 17:21:59 +00:00