diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:38:20 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-01-02 21:52:26 +0100 |
| commit | 3f3f5a5359973e95e94148676a9793d6f52468f3 (patch) | |
| tree | 65adf17c3d3f8d3a83bec29f51142fe884e942d8 /drivers/SCsub | |
| parent | db46a344180d4eae1455e97e22bf84c9c304be7c (diff) | |
| parent | 2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff) | |
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes
might have been made - time will tell :)
Diffstat (limited to 'drivers/SCsub')
| -rw-r--r-- | drivers/SCsub | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index 08a189272f..73a3f7898a 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -20,7 +20,7 @@ if (env["xaudio2"] == "yes"): SConscript("xaudio2/SCsub") # Graphics drivers -SConscript('gles2/SCsub') +SConscript('gles3/SCsub') SConscript('gl_context/SCsub') # Core dependencies |