diff options
| author | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy | 2015-01-14 23:17:15 +0300 |
| commit | d6998995b54fd4fed83eef9db3bbb45fa60565db (patch) | |
| tree | 927e4e2441db1c62b3853d03f3ed4bb996881045 /platform/nacl/os_nacl.cpp | |
| parent | b6c5cb1064eab63788060dc918d7fec53e57a532 (diff) | |
| parent | 04af74596d070f062bd917b0364d87c57544f8d5 (diff) | |
| download | godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.gz godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.tar.zst godot-d6998995b54fd4fed83eef9db3bbb45fa60565db.zip | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
platform/x11/detect.py
Diffstat (limited to 'platform/nacl/os_nacl.cpp')
| -rw-r--r-- | platform/nacl/os_nacl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/platform/nacl/os_nacl.cpp b/platform/nacl/os_nacl.cpp index d97195c50..65f66b035 100644 --- a/platform/nacl/os_nacl.cpp +++ b/platform/nacl/os_nacl.cpp @@ -64,7 +64,7 @@ int OSNacl::get_video_driver_count() const { }; const char * OSNacl::get_video_driver_name(int p_driver) const { - return "gles2"; + return "GLES2"; }; OS::VideoMode OSNacl::get_default_video_mode() const { |