Christoph Oelckers 251cdacf26 Merge branch 'master' into scripting ... Conflicts: src/g_shared/a_randomspawner.cpp src/g_strife/a_strifeweapons.cpp src/thingdef/thingdef_parse.cpp wadsrc/static/actors/constants.txt		2013-09-03 09:01:28 +02: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
fb_d3d9_wipe.cpp
fb_ddraw.cpp
hardware.cpp
hardware.h
helperthread.cpp
helperthread.h
i_cd.cpp
i_crash.cpp	- Use gitinfo.h instead of svnrevision.h for versioning.	2013-06-22 21:49:51 -05:00
i_dijoy.cpp
i_input.cpp
i_input.h
i_keyboard.cpp
i_main.cpp	Merge branch 'master' into scripting	2013-06-25 19:28:25 -05:00
i_mouse.cpp
i_movie.cpp
i_rawps2.cpp
i_system.cpp	Add some awareness of short file names	2013-08-29 21:24:05 -05:00
i_system.h	Add some awareness of short file names	2013-08-29 21:24:05 -05:00
i_xinput.cpp
icon1.ico
rawinput.h
resource.h
st_start.cpp
win32iface.h
win32video.cpp
winres.h
zdoom.exe.manifest
zdoom.rc	- Use gitinfo.h instead of svnrevision.h for versioning.	2013-06-22 21:49:51 -05:00
zdoom.RES