[Pkg-bazaar-commits] ./bzr-gtk/unstable r268: Merge some updates from the tango-icons branch.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 268
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sat 2007-08-25 15:05:28 +0200
message:
  Merge some updates from the tango-icons branch.
modified:
  NEWS
  icons/olive-gtk.png
  icons/oliveicon2.png
  olive/__init__.py
    ------------------------------------------------------------
    revno: 205.1.4
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: tango-icons
    timestamp: Sat 2007-08-25 14:52:25 +0200
    message:
      Merge from trunk.
    modified:
      NEWS
      TODO
      __init__.py
      annotate/colormap.py
      annotate/gannotate.py
      logview.py
      olive-gtk
      olive.glade
      olive/__init__.py
      olive/info_helper.py
      viz/branchwin.py
    ------------------------------------------------------------
    revno: 205.1.5
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: tango-icons
    timestamp: Sat 2007-08-25 15:03:46 +0200
    message:
      Added proper Credits.
    modified:
      olive/__init__.py
    ------------------------------------------------------------
    revno: 205.1.6
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: tango-icons
    timestamp: Sat 2007-08-25 15:04:10 +0200
    message:
      New Olive icon by Pascal and Jakub.
    modified:
      icons/olive-gtk.png
      icons/oliveicon2.png
    ------------------------------------------------------------
    revno: 205.1.7
    committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
    branch nick: tango-icons
    timestamp: Sat 2007-08-25 15:04:54 +0200
    message:
      Updated NEWS.
    modified:
      NEWS
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2007-08-24 14:00:55 +0000
+++ b/NEWS	2007-08-25 13:04:54 +0000
@@ -15,7 +15,7 @@
   
   * Added "update" menu item in Olive. (Mateusz Korniak)
   
-  * New Olive application icon. (Simon Pascal Klein)
+  * New Olive application icon. (Simon Pascal Klein and Jakub Steiner)
   
   * Show bzr viz interface quickly. (Gary van der Merwe)
 

=== modified file 'icons/olive-gtk.png'
Binary files a/icons/olive-gtk.png	2007-08-16 07:29:36 +0000 and b/icons/olive-gtk.png	2007-08-25 13:04:10 +0000 differ
=== modified file 'icons/oliveicon2.png'
Binary files a/icons/oliveicon2.png	2007-08-16 07:29:36 +0000 and b/icons/oliveicon2.png	2007-08-25 13:04:10 +0000 differ
=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2007-08-24 13:40:48 +0000
+++ b/olive/__init__.py	2007-08-25 13:03:46 +0000
@@ -66,7 +66,14 @@
 
     # Set version
     dialog.set_version(__version__)
-    dialog.set_artists(["Simon Pascal Klein"])
+    dialog.set_authors([ _("Lead Developer:"),
+			 "Szilveszter Farkas <szilveszter.farkas at gmail.com>",
+			 _("Contributors:"),
+			 "Jelmer Vernooij <jelmer at samba.org>",
+			 "Mateusz Korniak <mateusz.korniak at ant.gliwice.pl>",
+			 "Gary van der Merwe <garyvdm at gmail.com>" ])
+    dialog.set_artists([ "Simon Pascal Klein <klepas at klepas.org>",
+			 "Jakub Steiner <jimmac at novell.com>" ])
 
     dialog.run()
     # Destroy the dialog