23 lines
736 B
Plaintext
23 lines
736 B
Plaintext
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);
|
|
}
|
|
--- 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_ */
|