Randy Heit
2d87eb0ba2
Merge branch 'master' into gonesolong
...
Conflicts:
src/CMakeLists.txt
src/actor.h
src/g_heretic/a_hereticmisc.cpp
src/g_heretic/a_hereticweaps.cpp
src/g_heretic/a_ironlich.cpp
src/info.h
src/namedef.h
src/p_buildmap.cpp
src/p_enemy.cpp
src/p_map.cpp
src/p_mobj.cpp
src/thingdef/thingdef_codeptr.cpp
zdoom.vcproj
2014-12-20 19:13:14 -06:00
Randy Heit
7b63ee8ded
Add more stuff to .gitignore
2014-01-21 19:48:46 -06:00
Christoph Oelckers
7cb70f60b3
- removed duplicate #define warning in fmodsound.cpp.
...
- commented out output of Cr0NpxState for floating point state because this variable was renamed in most recent Windows headers.
- added CMAKE option to generate assembly output for release builds.
- added my CMake-based project directory to .gitignore.
2013-11-28 11:03:19 +01:00
Randy Heit
78196063da
- Add generated zcc-parse files to .gitignore
2013-06-25 19:29:49 -05:00
Randy Heit
1032170ccd
- Add .aps files to .gitignore
2013-06-24 20:53:49 -05:00
Christoph Oelckers
c0e634b0ac
- updated .gitignore to ignore all compile generated files.
2013-06-23 17:38:51 -05:00
Alex Mayfield
742ecd324b
Convert svn:ignore to .gitignore.
2013-06-13 21:24:08 -04:00
