Merge branch 'master' of git+ssh://openadk.org/git/openadk

1 files changed, 0 insertions, 23 deletions

diff --git a/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py b/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py
deleted file mode 100644
index 60d33bb2e..000000000
--- a/package/firefox/patches/patch-media_webrtc_trunk_tools_gyp_pylib_gyp_common_py
+++ /dev/null
@@ -1,23 +0,0 @@
---- mozilla-release.orig/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py	2013-12-05 17:07:48.000000000 +0100
-+++ mozilla-release/media/webrtc/trunk/tools/gyp/pylib/gyp/common.py	2014-02-05 08:12:49.000000000 +0100
-@@ -364,20 +364,6 @@ def WriteOnDiff(filename):
- 
- def GetFlavor(params):
-   """Returns |params.flavor| if it's set, the system's default flavor else."""
--  flavors = {
--    'cygwin': 'win',
--    'win32': 'win',
--    'darwin': 'mac',
--  }
--
--  if 'flavor' in params:
--    return params['flavor']
--  if sys.platform in flavors:
--    return flavors[sys.platform]
--  if sys.platform.startswith('sunos'):
--    return 'solaris'
--  if sys.platform.startswith('freebsd'):
--    return 'freebsd'
- 
-   return 'linux'
-