From 37175429873833547afb8f229c69001f7ffcfd69 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Dec 01 2014 10:02:33 +0000 Subject: Merge branch 'master' into f19 --- diff --git a/firefox-baseline-disable.patch b/firefox-baseline-disable.patch index 806d378..8052119 100644 --- a/firefox-baseline-disable.patch +++ b/firefox-baseline-disable.patch @@ -1,7 +1,6 @@ -diff -up firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile.old firefox-32.0.1/mozilla-release/media/webrtc/trunk/Makefile diff -up firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js ---- firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js.old 2014-09-12 00:25:45.000000000 +0200 -+++ firefox-32.0.1/mozilla-release/modules/libpref/src/init/all.js 2014-09-16 14:27:52.447743192 +0200 +--- firefox-32.0.1/mozilla-release/modules/libpref/init/all.js.old 2014-09-12 00:25:45.000000000 +0200 ++++ firefox-32.0.1/mozilla-release/modules/libpref/init/all.js 2014-09-16 14:27:52.447743192 +0200 @@ -844,7 +844,7 @@ pref("javascript.options.strict", #ifdef DEBUG pref("javascript.options.strict.debug", true);