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
..
carbon
cocoa	Uninline namespace dcx	2015-12-13 18:00:49 +00:00
ogl	Move namespace dsx handling to dsx-ns.h	2016-03-19 19:08:10 +00:00
sdl	Merge branch 'unification/master' into allow_dialog_subclass	2016-10-10 14:40:11 +08:00
win32	Uninline namespace dcx	2015-12-13 18:00:49 +00:00