From 61cbbcbe02f11d67e4fe9f3c4f452442d2e9f778 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Fri, 3 Nov 2017 01:55:01 +0100
Subject: Start migrating 0.92 patch to master

---
 src/xml/simple-node.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/xml/simple-node.h')

diff --git a/src/xml/simple-node.h b/src/xml/simple-node.h
index f2cfa953c..fd41e53a8 100644
--- a/src/xml/simple-node.h
+++ b/src/xml/simple-node.h
@@ -91,7 +91,9 @@ public:
     char const *content() const;
     void setContent(char const *value);
 
-    void mergeFrom(Node const *src, char const *key);
+    void cleanOriginal(Node *src, gchar const *key);
+    bool equal(Node const *other, bool recursive);
+    void mergeFrom(Node const *src, char const *key, bool extension = false, bool clean = false);
 
     Inkscape::Util::List<AttributeRecord const> attributeList() const {
         return _attributes;
-- 
cgit v1.2.3