diff options
| author | Juan Linietsky | 2015-03-03 14:41:36 -0300 |
|---|---|---|
| committer | Juan Linietsky | 2015-03-03 14:41:36 -0300 |
| commit | 2c2894ceb674927a35d2798b3e63adabdb020077 (patch) | |
| tree | 9e8950e0acc8fb7531fa60ce8c0321a5b60c335a /drivers/SCsub | |
| parent | 4d2198110b4af7f203eeef95697255569e49bce7 (diff) | |
| parent | a0ee5cc3531786a652ee43d3a57cb69dff34bd70 (diff) | |
| download | godot-2c2894ceb674927a35d2798b3e63adabdb020077.tar.gz godot-2c2894ceb674927a35d2798b3e63adabdb020077.tar.zst godot-2c2894ceb674927a35d2798b3e63adabdb020077.zip | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
modules/gdscript/gd_tokenizer.cpp
scene/resources/shader_graph.h
Diffstat (limited to 'drivers/SCsub')
| -rw-r--r-- | drivers/SCsub | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/SCsub b/drivers/SCsub index 46334468b..a1a2191cb 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -10,7 +10,6 @@ SConscript('alsa/SCsub'); SConscript('pulseaudio/SCsub');
SConscript('windows/SCsub');
SConscript('gles2/SCsub');
-SConscript('gles1/SCsub');
SConscript('gl_context/SCsub');
SConscript('openssl/SCsub');
|