asarium 5f23381c07 Merge branch 'master' into antipodes_/sync ...

Conflicts:
	code/cmdline/cmdline.cpp
	code/globalincs/pstypes.h
	code/globalincs/windebug.cpp
	code/graphics/2d.cpp
	code/windows_stub/stubs.cpp

2015-10-31 17:18:29 +01:00

..

dialogs.cpp

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

dialogs.h

Merge branch 'master' into antipodes_/sync

2015-10-31 17:18:29 +01:00

monopub.h

remove PreProcDefine #includes in FS2

2005-07-13 03:35:36 +00:00

osapi.cpp

Merge pull request #330 from asarium/antipodes_/messageBoxCleanup

2015-08-31 08:58:54 +02:00

osapi.h

Replace Win32 MessageBox with os::dialogs version

2015-08-28 16:24:35 +02:00

osregistry_unix.cpp

sync to trunk 10046

2013-11-25 18:40:16 +10:00

osregistry.cpp

sync to trunk 10046

2013-11-25 18:40:16 +10:00

osregistry.h

sync to trunk 10046

2013-11-25 18:40:16 +10:00

outwnd_unix.cpp

Fix compilation under linux

2015-05-28 13:56:07 +02:00

outwnd.cpp

Fix outwnd on Unix

2015-06-05 00:08:24 +02:00

outwnd.h

Merge branch 'master' into antipodes

2015-08-15 16:41:34 +02:00