Commit Graph

11 Commits

Author SHA1 Message Date
Christoph Oelckers 3e318e4555 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	.gitignore
	src/CMakeLists.txt
2014-02-16 21:08:44 +01:00
Randy Heit 7b63ee8ded Add more stuff to .gitignore 2014-01-21 19:48:46 -06:00
Christoph Oelckers 45070114e8 Merge branch 'master' of https://github.com/rheit/zdoom
Conflicts:
	.gitignore
	CMakeLists.txt
2013-11-28 12:44:27 +01: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
Christoph Oelckers 41856905be - CMake: The GL renderer requires fast Floating point math or performance will go down the drain.
- added CMake 'build' directory to .gitignore.
2013-10-09 13:06:18 +02:00
Christoph Oelckers 93e040b322 Merge branch 'master' of https://github.com/rheit/zdoom 2013-06-25 09:23:11 +02: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
Christoph Oelckers 4500145ef9 - forgot to add wadsrc_lights and wadsrc_bm projects to solution. 2013-06-23 14:36:26 +02:00
Christoph Oelckers d8abeceef9 - updated .gitignore to ignore all compile generated files. 2013-06-23 13:31:06 +02:00
Alex Mayfield 742ecd324b Convert svn:ignore to .gitignore. 2013-06-13 21:24:08 -04:00