Christoph Oelckers 1e5fbc1423 Merge remote-tracking branch 'remotes/origin/master' into 2D_Refactor ... # Conflicts: # src/posix/cocoa/i_video.mm		2018-03-30 22:06:17 +02:00
..
critsec.cpp	cleanup of MIDI code dependencies	2017-03-10 19:08:36 +01:00
i_common.h	Removed all code needed to support macOS earlier than 10.7 Lion	2017-10-07 15:11:30 +03:00
i_input.mm	Disabled modifier keys processing in UI by Cocoa backend	2017-12-25 18:14:56 +02:00
i_joystick.cpp	Fixed compilation warnings in Cocoa backend	2016-11-19 16:42:16 +01:00
i_main.mm	Removed last remnants of PowerPC Mac support	2018-02-11 16:35:34 +02:00
i_main_except.cpp	- changed Doom source license to GPL in all subdirectories and fixed missing licenses in a few other files.	2017-04-17 12:27:19 +02:00
i_system.mm	- remove empty Mac I_HTTPRequest prototype since it's not used	2018-03-12 19:33:49 +01:00
i_video.mm	Merge remote-tracking branch 'remotes/origin/master' into 2D_Refactor	2018-03-30 22:06:17 +02:00
sdlglvideo.h	- removed Accel2D variable and a little bit of locking cruft.	2018-03-27 17:13:10 +02:00
st_console.h	Made sure that the last text line is always visible in OS X startup window	2016-02-28 23:15:22 +01:00
st_console.mm	- rename I_FPSTime function.	2017-11-13 00:54:32 +01:00
st_start.mm	Added four text colors: ice, fire, sapphire, teal	2017-09-23 11:56:16 +02:00