# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1398613985 -7200
# Node ID 727fef76f8d7a63cc191c8c39e62fbb790013355
# Parent  cc8d77a6a0b66492cf5753f6a8fe559349ba2281
manual merge from firefox29

diff -r cc8d77a6a0b6 -r 727fef76f8d7 MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Sat Apr 26 14:26:07 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Sun Apr 27 17:53:05 2014 +0200
@@ -1,5 +1,5 @@
 -------------------------------------------------------------------
-Wed Apr 23 08:03:17 UTC 2014 - wr@rosenauer.org
+Sun Apr 27 15:51:18 UTC 2014 - wr@rosenauer.org
 
 - update to Aurora 30 (20140422)
   * rebased patches
@@ -8,15 +8,18 @@
 - enabled GStreamer 1.0 usage for 13.2 and above
 
 -------------------------------------------------------------------
-Sat Apr 19 06:21:06 UTC 2014 - wr@rosenauer.org
-
-- update to Firefox 29beta9
-  * rebased patches
-  * removed obsolete patches
+Sat Apr 26 12:18:07 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 29.0 (bnc#875378)
+- rebased patches
+- removed obsolete patches
+  * firefox-browser-css.patch
+  * mozilla-aarch64-599882cfb998.diff
+  * mozilla-aarch64-bmo-963028.patch
+  * mozilla-aarch64-bmo-963029.patch
+  * mozilla-aarch64-bmo-963030.patch
+  * mozilla-aarch64-bmo-963031.patch
 - requires NSS 3.16
-- patches disabled temporarily (TODO)
-  * mozilla-ppc64le-build.patch
-  * firefox-browser-css.patch
 - added mozilla-icu-strncat.patch to fix post build checks
 
 -------------------------------------------------------------------
diff -r cc8d77a6a0b6 -r 727fef76f8d7 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Sat Apr 26 14:26:07 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Apr 27 17:53:05 2014 +0200
@@ -121,7 +121,6 @@
 Patch30:        mozilla-aarch64-bmo-810631.patch
 
 # Firefox/browser
-Patch100:       firefox-browser-css.patch
 Patch101:       firefox-kde.patch
 Patch102:       firefox-kde-114.patch
 Patch103:       firefox-no-default-ualocale.patch
@@ -263,7 +262,6 @@
 %patch30 -p1
 
 # Firefox
-#%patch100 -p1
 %patch101 -p1
 %if %suse_version >= 1140
 %patch102 -p1
diff -r cc8d77a6a0b6 -r 727fef76f8d7 series
--- a/series	Sat Apr 26 14:26:07 2014 +0200
+++ b/series	Sun Apr 27 17:53:05 2014 +0200
@@ -15,7 +15,6 @@
 mozilla-ppc.patch
 mozilla-idldir.patch
 mozilla-libproxy-compat.patch
-#mozilla-ppc64le-build.patch
 mozilla-aarch64-bmo-810631.patch
 
 # Firefox patches