[Pkg-bazaar-commits] ./bzr-gtk/unstable r96: Merge from trunk.

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 96
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2006-10-15 21:54:20 +0200
message:
  Merge from trunk.
modified:
  AUTHORS
    ------------------------------------------------------------
    revno: 91.1.2
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr-gtk
    timestamp: Sat 2006-10-14 21:14:14 +0200
    message:
      List Szilvester as maintainer, add note about other authors.
    modified:
      AUTHORS
    ------------------------------------------------------------
    revno: 91.1.3
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: bzr-gtk
    timestamp: Sun 2006-10-15 21:20:37 +0200
    message:
      merge bug fixes from Szilvester
    added:
      olive/merge.py
    modified:
      .bzrignore
      olive.glade
      olive/__init__.py
      olive/commit.py
-------------- next part --------------
=== modified file 'AUTHORS'
--- a/AUTHORS	2006-09-30 10:21:43 +0000
+++ b/AUTHORS	2006-10-14 19:14:14 +0000
@@ -1,8 +1,8 @@
 bzr-gtk is a plugin that is based on a collection of earlier plugins for 
-Bazaar. It is currently maintained by Jelmer Vernooij <jelmer at samba.org>.
+Bazaar. It is currently maintained by Jelmer Vernooij <jelmer at samba.org> and 
+Szilveszter Farkas <Szilveszter.Farkas at gmail.com>.
 
 bzrk was written by Scott James Remnant <scott at ubuntu.com>. 
-
 It's vaguely based on a screenshot of gitk (the equivalent tool for git)
 shown to me by Fabio M. Di Nitto <fabbione at ubuntu.com>.
 
@@ -13,4 +13,5 @@
 
 Olive was written by Szilveszter Farkas <Szilveszter.Farkas at gmail.com>.
 
-See the Bazaar history of this branch for a full list of authors.
+Numerous other people have contributed useful patches.  See the Bazaar history 
+of this branch for a full list of authors.