Merge branch 'GLES3'

Conflicts:
	Source/Android/.idea/workspace.xml
This commit is contained in:
Ryan Houdek
2013-06-12 03:29:18 -05:00
12 changed files with 385 additions and 12 deletions

View File

@ -12,7 +12,7 @@
<string-array name="gpuOptions">
<item>Software Renderer</item>
<!--item>OpenGL</item-->
<item>OpenGL</item>
</string-array>
<string-array name="gpuValues">