diff options
| author | reduz <juan@okamstudio.com> | 2015-10-16 19:13:09 -0300 |
|---|---|---|
| committer | reduz <juan@okamstudio.com> | 2015-10-16 19:13:09 -0300 |
| commit | 17a90ddc0824bb51b5ea707f5d4d11aed301f91d (patch) | |
| tree | f17a5e3c66e1aaee0cabe2f16d16611b97bda6cb /platform/osx | |
| parent | 078a474135b47adb3cbdf414c737b77ee17fe596 (diff) | |
| parent | 79e5ced7e668fa53567ac6aaf5a26393cea6c9a2 (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Conflicts:
scene/resources/packed_scene.h
Diffstat (limited to 'platform/osx')
| -rw-r--r-- | platform/osx/detect.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 4a20ca80c1..22cee0527e 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -31,7 +31,6 @@ def get_flags(): ('opengl', 'no'), ('legacygl', 'yes'), ('builtin_zlib', 'no'), - ("theora","no"), ('freetype','builtin'), #use builtin freetype ] |