degasus 382be2aabd Merge branch 'master' into GLSL-master ...

Conflicts:
	.gitignore

2013-03-12 11:28:56 +01:00

..

Src

Merge branch 'master' into GLSL-master

2013-03-12 11:28:56 +01:00

CMakeLists.txt

ARM Support without GLSL

2013-02-26 13:49:00 -06:00

Core.vcxproj

Fix "Core" to build with "Unicode".

2013-02-27 20:30:57 -06:00

Core.vcxproj.filters

ARM Support without GLSL

2013-02-26 13:49:00 -06:00