Merge branch 'master' of https://github.com/okamstudio/godot

Conflicts:
	scene/resources/packed_scene.h

4 files changed, 1 insertions, 5 deletions

diff --git a/platform/android/detect.py b/platform/android/detect.py
index c0c091b20a..c36e35484e 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -38,8 +38,6 @@ def get_flags():
 		('nedmalloc', 'no'),
 		('builtin_zlib', 'no'),
                 ('openssl','builtin'), #use builtin openssl
-		('theora','no'), #use builtin openssl
-
         ]
 
 
diff --git a/platform/iphone/detect.py b/platform/iphone/detect.py
index 0661b45c1b..137fcc56f5 100644
--- a/platform/iphone/detect.py
+++ b/platform/iphone/detect.py
@@ -38,7 +38,6 @@ def get_flags():
 	return [
 		('tools', 'no'),
 		('webp', 'yes'),
-		("theora","no"),       		
 		('openssl','builtin'), #use builtin openssl
 	]
 
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
 	]
 
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 33e8fd03e2..9a52a7c92b 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -63,7 +63,7 @@ def get_flags():
 	return [
 	('builtin_zlib', 'no'),
 	("openssl", "yes"),
-	("theora","no"),
+	#("theora","no"),
         ]