diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-06-12 03:29:18 -0500 |
|---|---|---|
| committer | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-06-12 03:29:18 -0500 |
| commit | 3ddd24872b7280a9ce9557c69c6ee49f23ed7a03 (patch) | |
| tree | f4424a513eaacadf3c3305ae206d2a5a0dc09047 /Source/Android | |
| parent | e4a3919a2bfb0e5db5e9de64790f809d3de97244 (diff) | |
| parent | fa4ad82878d6ac416e1d1d5bd421ddc4399a6700 (diff) | |
Merge branch 'GLES3'
Conflicts:
Source/Android/.idea/workspace.xml
Diffstat (limited to 'Source/Android')
| -rw-r--r-- | Source/Android/res/values/prefvalues.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Android/res/values/prefvalues.xml b/Source/Android/res/values/prefvalues.xml index 3f67dcbe5b..77354f76a4 100644 --- a/Source/Android/res/values/prefvalues.xml +++ b/Source/Android/res/values/prefvalues.xml @@ -12,7 +12,7 @@ <string-array name="gpuOptions"> <item>Software Renderer</item> - <!--item>OpenGL</item--> + <item>OpenGL</item> </string-array> <string-array name="gpuValues"> |