[Pkg-bazaar-commits] ./bzr-gtk/unstable r258: Merge from tango-icons branch.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 258
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Thu 2007-08-16 09:30:04 +0200
message:
  Merge from tango-icons branch.
modified:
  NEWS
  icons/olive-gtk.png
  icons/oliveicon2.png
  olive/__init__.py
    ------------------------------------------------------------
    revno: 205.1.2
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: tango-icons
    timestamp: Thu 2007-08-16 09:17:26 +0200
    message:
      Merge the changes from trunk.
    added:
      about.py
      bazaar-properties.desktop
      bzr-notify.desktop
      mergedirective.py
      notify.py
      olive.gladep
      revidbox.py
      revisionmenu.py
      tests/test_diff.py
    renamed:
      oliveicon2.png => icons/oliveicon2.png
    modified:
      .bzrignore
      HACKING
      NEWS
      README
      TODO
      __init__.py
      branch.py
      cmenu.ui
      commit.py
      conflicts.py
      dialog.py
      diff.py
      genpot.sh
      history.py
      logview.py
      missing.py
      olive-gtk.desktop
      olive.glade
      olive/__init__.py
      olive/menu.py
      olive/rename.py
      po/olive-gtk.pot
      preferences.py
      push.py
      setup.py
      tags.py
      tests/__init__.py
      ui.py
      viz/branchwin.py
      viz/graph.py
    ------------------------------------------------------------
    revno: 205.1.3
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: tango-icons
    timestamp: Thu 2007-08-16 09:29:36 +0200
    message:
      Added Tango-style Olive application icon.
    modified:
      NEWS
      icons/olive-gtk.png
      icons/oliveicon2.png
      olive/__init__.py
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-08-13 10:08:10 +0000
+++ b/NEWS	2007-08-16 07:29:36 +0000
@@ -10,6 +10,8 @@
 															Korniak, Jelmer)
 
   * Add remove and delete menu item in Olive. (#127392, Mateusz Korniak)
+  
+  * New Olive application icon. (Simon Pascal Klein)
 
  UI
   

=== modified file 'icons/olive-gtk.png'
Binary files a/icons/olive-gtk.png	2006-08-15 17:37:54 +0000 and b/icons/olive-gtk.png	2007-08-16 07:29:36 +0000 differ
=== modified file 'icons/oliveicon2.png'
Binary files a/icons/oliveicon2.png	2007-08-10 10:45:06 +0000 and b/icons/oliveicon2.png	2007-08-16 07:29:36 +0000 differ
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2007-07-21 14:55:44 +0000
+++ b/olive/__init__.py	2007-08-16 07:29:36 +0000
@@ -66,6 +66,7 @@
 
     # Set version
     dialog.set_version(__version__)
+    dialog.set_artists(["Simon Pascal Klein"])
 
     dialog.run()
     # Destroy the dialog