[Libreoffice-commits] core.git: 2 commits - .gitattributes include/svx

[Michael Stahl]

 .gitattributes                       |    2 ++
 include/svx/sidebar/ColorControl.hxx |    9 +++++++++
 2 files changed, 11 insertions(+)

New commits:
commit f506b899262720928e228e904f8148ddee6f8aae
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 5 22:33:17 2013 +0200

    ColorControl.hxx: header guards still necessary in 21st century
    
    Change-Id: I27e773327cdcdc80d7cee0591741a7e1f439afbf

diff --git a/include/svx/sidebar/ColorControl.hxx b/include/svx/sidebar/ColorControl.hxx
index 1ba2e34..56cac38 100644
--- a/include/svx/sidebar/ColorControl.hxx
+++ b/include/svx/sidebar/ColorControl.hxx
@@ -1,3 +1,4 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -15,6 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#ifndef SVX_COLORCONTROL_HXX
+#define SVX_COLORCONTROL_HXX
+
 #include "svx/sidebar/PopupControl.hxx"
 
 #include <svtools/valueset.hxx>
@@ -80,3 +85,7 @@ private:
 };
 
 } } // end of namespace svx::sidebar
+
+#endif // SVX_COLORCONTROL_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 93e425cda7b7ea026842bb6619d9aa4ce3280048
Author: Michael Stahl <mstahl at redhat.com>
Date:   Thu Sep 5 22:27:16 2013 +0200

    .gitattributes: treat .svg and .jcs as binary
    
    this is apparently the only way to prevent results from endless base64
    encoded lines (svg) or endless line containing all UNO API identifiers
    (jcs) in "git grep foo".
    
    Change-Id: I53326386ece9dbde0fb372d1616e643a89d51a40

diff --git a/.gitattributes b/.gitattributes
index 416fa8c..2801962 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,4 @@
 *.doc binary
 *.sdw binary
+*.svg binary
+*.jcs binary