[meld] Add "New" emblem from gnome-icon-theme



commit ae1ee9679de830f37c57ecc535907bc0e4b4d761
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Thu Oct 14 17:00:09 2010 +1000

    Add "New" emblem from gnome-icon-theme
    
    This commit borrows the "New" emblem from gnome-icon-theme to give us a
    more modern looking emblem for overlaying on files and directories in
    directory comparison.
    
    data/icons/COPYING: Note the license terms for the new emblem
    data/icons/COPYING_CCBYSA3: Add CC-BY-SA-3 license
    data/icons/emblem-meld-newer-file.png: The 'new' emblem
    data/ui/meldapp.ui: Add artwork attribution to About dialog

 data/icons/COPYING                    |    7 +++++++
 data/icons/COPYING_CCBYSA3            |    7 +++++++
 data/icons/emblem-meld-newer-file.png |  Bin 0 -> 328 bytes
 data/ui/meldapp.ui                    |    1 +
 4 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/data/icons/COPYING b/data/icons/COPYING
new file mode 100644
index 0000000..52b9052
--- /dev/null
+++ b/data/icons/COPYING
@@ -0,0 +1,7 @@
+
+Some icons distributed with Meld are from other sources, and are licensed
+separately.
+
+emblem-meld-newer-file.png is taken from the gnome-icon-theme project at
+gnome/8x8/emblems/emblem-new.png and is licensed under the terms of the
+Creative Commons BY-SA 3.0 license. See COPYING_CCBYSA3 for details.
\ No newline at end of file
diff --git a/data/icons/COPYING_CCBYSA3 b/data/icons/COPYING_CCBYSA3
new file mode 100644
index 0000000..9000be8
--- /dev/null
+++ b/data/icons/COPYING_CCBYSA3
@@ -0,0 +1,7 @@
+This work is licenced under the Creative Commons Attribution-Share Alike 3.0
+United States License. To view a copy of this licence, visit
+http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to Creative
+Commons, 171 Second Street, Suite 300, San Francisco, California 94105, USA.
+
+When attributing the artwork, using "GNOME Project" is enough.
+Please link to http://www.gnome.org where available.
diff --git a/data/icons/emblem-meld-newer-file.png b/data/icons/emblem-meld-newer-file.png
new file mode 100644
index 0000000..45e570b
Binary files /dev/null and b/data/icons/emblem-meld-newer-file.png differ
diff --git a/data/ui/meldapp.ui b/data/ui/meldapp.ui
index 4bce854..643b2d4 100644
--- a/data/ui/meldapp.ui
+++ b/data/ui/meldapp.ui
@@ -81,6 +81,7 @@
 With help from:
 See changelog for individual credits.
 </property>
+    <property name="artists">GNOME Project</property>
     <property name="translator-credits">Beno&#xEE;t Dejean (fr)
 Takeshi Aihana (ja)
 Dongsu Jang (ko)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]