Rachael Alexanderson 21a8964bea Merge remote-tracking branch 'gzdoom/master' ... # Conflicts: # src/v_video.cpp		2017-03-03 16:29:33 -05:00
..
anim_switches.cpp
animations.cpp
automaptexture.cpp
backdroptexture.cpp	- replaced SDWORD with int32_t globally.	2017-03-03 19:35:08 +01:00
bitmap.cpp
bitmap.h
buildtexture.cpp
canvastexture.cpp
ddstexture.cpp	Merge remote-tracking branch 'gzdoom/master'	2017-03-03 16:29:33 -05:00
emptytexture.cpp
flattexture.cpp
imgztexture.cpp
jpegtexture.cpp	Merge https://github.com/rheit/zdoom	2016-12-19 08:16:41 -05:00
multipatchtexture.cpp	Merge branch 'master' of https://github.com/rheit/zdoom	2016-12-22 11:29:44 +01:00
patchtexture.cpp
pcxtexture.cpp	Merge https://github.com/rheit/zdoom	2016-12-19 08:16:41 -05:00
pngtexture.cpp	Merge https://github.com/rheit/zdoom	2016-12-19 08:16:41 -05:00
rawpagetexture.cpp
texture.cpp
texturemanager.cpp	- all menu items scriptified, but not yet active.	2017-02-11 16:11:48 +01:00
textures.h	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-16 06:03:21 +01:00
tgatexture.cpp	Merge https://github.com/rheit/zdoom	2016-12-19 08:16:41 -05:00
warpbuffer.h
warptexture.cpp	Merge https://github.com/coelckers/gzdoom	2017-01-06 22:06:25 -05:00