dxx-rebirth/d2x-rebirth/main
Chris Taylor bc1c9ebd97 Merge branch 'unification/master' into allow_dialog_subclass
Conflicts:
	common/arch/sdl/window.cpp - Remove unused EVENT_WINDOW_CLOSED and w_callback local var
	common/ui/dialog.cpp - Remove unused EVENT_WINDOW_CLOSED
2016-10-10 14:40:11 +08:00
..
bmread.cpp Move EDITOR to dxxsconf.h; rename to DXX_USE_EDITOR 2016-09-11 18:49:16 +00:00
descent.cfg
escort.cpp Merge branch 'unification/master' into allow_dialog_subclass 2016-10-10 14:40:11 +08:00
gamepal.cpp Move EDITOR to dxxsconf.h; rename to DXX_USE_EDITOR 2016-09-11 18:49:16 +00:00
inferno.ini
libmve.h
movie.cpp Replace delete dcx::window kludge with a better solution 2016-10-04 14:05:44 +08:00
movie.h Move OGL to dxxsconf.h; rename to DXX_USE_OGL 2016-09-24 18:06:11 +00:00
physfsrwops.h