#
# ChangeLog for code/branches/shaders_merge/contrib
#
# Generated by Trac 1.0.9
# May 18, 2024, 12:06:37 PM

Mon, 18 Jan 2016 20:58:41 GMT landauf [11072]
	* code/branches/shaders_merge (copied)

	created branch to merge 'shaders' branch (from pps HS 2012)


Thu, 12 Feb 2015 17:05:25 GMT muemart [10267]
	* code/trunk/cmake/tools/SourceFileUtilities.cmake (modified)
	* code/trunk/cmake/tools/TargetUtilities.cmake (modified)
	* code/trunk/contrib/orxonox.ico (added)
	* code/trunk/contrib/winresource.rc (added)
	* code/trunk/src/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/CMakeLists.txt (modified)
	* code/trunk/src/libraries/core/GraphicsManager.cc (modified)

	Add program icon for Windows builds (MSVC only for now)