Index: branches/2018Q1/www/waterfox/distinfo
===================================================================
--- branches/2018Q1/www/waterfox/distinfo	(revision 458499)
+++ branches/2018Q1/www/waterfox/distinfo	(revision 458500)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1515165188
-SHA256 (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = edb392795c8ce3658a9c4e7874424548f0091ea45ca0a36bd587be484c335111
-SIZE (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = 394203963
+TIMESTAMP = 1515201685
+SHA256 (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = baf0717ed49005535cce646976c4d088a25033bd83960381388e7b2ba23389c9
+SIZE (MrAlex94-Waterfox-56.0.2_GH0.tar.gz) = 394203428
Index: branches/2018Q1/www/waterfox/files/patch-typos
===================================================================
--- branches/2018Q1/www/waterfox/files/patch-typos	(revision 458499)
+++ branches/2018Q1/www/waterfox/files/patch-typos	(revision 458500)
@@ -1,30 +1,22 @@
 Mismerges found by comparing changes with Firefox 56
 
 --- dom/base/nsNodeUtils.cpp.orig
 +++ dom/base/nsNodeUtils.cpp
 @@ -589,6 +589,7 @@ nsNodeUtils::CloneAndAdopt(nsINode *aNode, bool aClone, bool aDeep,
            if (wasRegistered) {
              aNode->OwnerDoc()->UnregisterActivityObserver(aNode->AsElement());
            }
 +          aNode->mNodeInfo.swap(newNodeInfo);
            if (elem) {
              elem->NodeInfoChanged(newDoc);
            }
---- media/libcubeb/src/moz.build
-+++ media/libcubeb/src/moz.build
-@@ -89,4 +89,4 @@ CFLAGS += CONFIG['MOZ_ALSA_CFLAGS']
- CFLAGS += CONFIG['MOZ_PULSEAUDIO_CFLAGS']
- 
- # We allow warnings for third-party code that can be updated from upstream.
--AllowCompilerWarnings()
-+ALLOW_COMPILER_WARNINGS = True
 --- security/nss/lib/softoken/softkver.h.orig
 +++ security/nss/lib/softoken/softkver.h
 @@ -26,6 +26,6 @@
  #define SOFTOKEN_VMINOR 32
  #define SOFTOKEN_VPATCH 1
  #define SOFTOKEN_VBUILD 0
 -#define SOFTOKEN_BETA PR_TRUE
 +#define SOFTOKEN_BETA PR_FALSE
  
  #endif /* _SOFTKVER_H_ */
Index: branches/2018Q1
===================================================================
--- branches/2018Q1	(revision 458499)
+++ branches/2018Q1	(revision 458500)

Property changes on: branches/2018Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r458499