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
..
2d	Remove unnecessary diminish_palette in pcx_write_bitmap	2016-10-02 00:34:49 +00:00
3d	Rename WORDS_NEED_ALIGNMENT to DXX_WORDS_NEED_ALIGNMENT	2016-10-09 17:35:03 +00:00
arch	Factor out gr_set_attributes SDL_GL_SetAttribute calls	2016-10-02 19:35:34 +00:00
editor	Merge branch 'unification/master' into allow_dialog_subclass	2016-10-10 14:40:11 +08:00
main	Merge branch 'unification/master' into allow_dialog_subclass	2016-10-10 14:40:11 +08:00
misc	Fix some use_udp=0 build breaks	2016-10-08 23:24:22 +00:00