Rachael Alexanderson 2b8db72cef Merge commit '2234d36c7ac531fd802803216f747f82b58be8c2' ... # Conflicts: # src/r_main.cpp # src/r_plane.cpp # src/r_things.cpp		2017-02-15 05:42:57 -05:00
..
afxres.h
boing1.ico
boing2.ico
boing3.ico
boing4.ico
boing5.ico
boing6.ico
boing7.ico
boing8.ico
critsec.h
deadguy.bmp
eaxedit.cpp
fb_d3d9.cpp	Merge https://github.com/coelckers/gzdoom	2017-02-04 02:56:18 -05:00
fb_d3d9_wipe.cpp
fb_ddraw.cpp
hardware.cpp
hardware.h
helperthread.cpp
helperthread.h
i_cd.cpp
i_crash.cpp	Merge https://github.com/coelckers/gzdoom	2017-02-01 21:57:37 -05:00
i_dijoy.cpp
i_input.cpp	Merged p_setup conflict	2017-02-03 13:02:44 +02:00
i_input.h
i_keyboard.cpp
i_main.cpp	- reverted debug stuff.	2017-01-11 17:16:07 +01:00
i_mouse.cpp	Fixed mouse input in event handlers. Added RequireMouse field in event handler to signify that native mouse should be turned on for certain handlers.	2017-02-03 20:34:34 +02:00
i_rawps2.cpp
i_specialpaths.cpp
i_system.cpp
i_system.h
i_xinput.cpp
icon1.ico
optwin32.h
rawinput.h
resource.h
st_start.cpp
wglext.h
win32gliface.cpp	Merge https://github.com/coelckers/gzdoom	2017-01-10 11:03:58 -05:00
win32gliface.h
win32iface.h	Merge https://github.com/coelckers/gzdoom	2017-02-04 02:56:18 -05:00
win32video.cpp	Merge https://github.com/coelckers/gzdoom	2017-02-04 02:56:18 -05:00
winres.h
zdoom.exe.manifest
zdoom.rc	Fix typo	2017-01-13 13:31:33 +01:00