From 2aeeb785bf3f166eb9128b72267605bc6535e17f Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Mon, 18 Feb 2019 22:16:38 +0100
Subject: Merge from master

---
 clang_format_diff | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 clang_format_diff

(limited to 'clang_format_diff')

diff --git a/clang_format_diff b/clang_format_diff
new file mode 100644
index 000000000..4984e32cc
--- /dev/null
+++ b/clang_format_diff
@@ -0,0 +1,27 @@
+--- src/ui/dialog/cssdialog.h	(before formatting)
++++ src/ui/dialog/cssdialog.h	(after formatting)
+@@ -63,15 +63,15 @@
+             add(attr_color);
+             add(attr_strike);
+             add(editable);
+-    }
+-    Gtk::TreeModelColumn<bool> deleteButton;
+-    Gtk::TreeModelColumn<Glib::ustring> label;
+-    Gtk::TreeModelColumn<Glib::ustring> _styleAttrVal;
+-    Gtk::TreeModelColumn<Glib::ustring> _styleSheetVal;
+-    Gtk::TreeModelColumn<Gdk::RGBA> label_color;
+-    Gtk::TreeModelColumn<Gdk::RGBA> attr_color;
+-    Gtk::TreeModelColumn<bool> attr_strike;
+-    Gtk::TreeModelColumn<bool> editable;
++        }
++        Gtk::TreeModelColumn<bool> deleteButton;
++        Gtk::TreeModelColumn<Glib::ustring> label;
++        Gtk::TreeModelColumn<Glib::ustring> _styleAttrVal;
++        Gtk::TreeModelColumn<Glib::ustring> _styleSheetVal;
++        Gtk::TreeModelColumn<Gdk::RGBA> label_color;
++        Gtk::TreeModelColumn<Gdk::RGBA> attr_color;
++        Gtk::TreeModelColumn<bool> attr_strike;
++        Gtk::TreeModelColumn<bool> editable;
+     };
+     CssColumns _cssColumns;
+ 
-- 
cgit v1.2.3