# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1567663537 -7200
# Node ID 15a995ab86c65a0f147d5ebd448a403b6da0e4cb
# Parent  54482415d6bdf0d89d859da5d13c8138f1b50969# Parent  a4709640638ea2ab623bad0052e94b6b14d917a9
merge from firefox68 to inherit platform fixes

diff -r a4709640638e -r 15a995ab86c6 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Sep 05 08:03:30 2019 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Sep 05 08:05:37 2019 +0200
@@ -18,13 +18,13 @@
 
 
 # changed with every update
-%define major          68
-%define mainver        %major.1.0
-%define orig_version   68.1.0
-%define orig_suffix    esr
-%define update_channel esr68
+%define major          69
+%define mainver        %major.0
+%define orig_version   69.0
+%define orig_suffix    %{nil}
+%define update_channel release
 %define branding       1
-%define releasedate    20190826132627
+%define releasedate    20190827005903
 %define source_prefix  firefox-%{orig_version}
 
 # always build with GCC as SUSE Security Team requires that
diff -r a4709640638e -r 15a995ab86c6 MozillaFirefox/tar_stamps
--- a/MozillaFirefox/tar_stamps	Thu Sep 05 08:03:30 2019 +0200
+++ b/MozillaFirefox/tar_stamps	Thu Sep 05 08:05:37 2019 +0200
@@ -1,8 +1,8 @@
 PRODUCT="firefox"
-CHANNEL="esr68"
-VERSION="68.1.0"
-VERSION_SUFFIX="esr"
-FF_RELEASE_TAG="380fedbb18002297f1b233bd9c09764e59ddaa86"
+CHANNEL="release"
+VERSION="69.0"
+VERSION_SUFFIX=""
+FF_RELEASE_TAG="cce4622026ab8e0130a0afc03f829f9b19ca38c2"
 TB_RELEASE_TAG=""
 PREV_VERSION=""
 PREV_VERSION_SUFFIX=""