[Pkg-bazaar-commits] ./bzr-gtk/unstable r110: Merge from trunk (0.12.0 release).

[Szilveszter Farkas (Phanatic)]

------------------------------------------------------------
revno: 110
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sat 2006-11-04 20:21:29 +0100
message:
  Merge from trunk (0.12.0 release).
modified:
  __init__.py
  olive/__init__.py
    ------------------------------------------------------------
    revno: 91.1.12
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: trunk
    timestamp: Sat 2006-11-04 17:05:23 +0100
    message:
      Bump version number.
    modified:
      __init__.py
      olive/__init__.py
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2006-11-02 23:01:58 +0000
+++ b/__init__.py	2006-11-04 16:05:23 +0000
@@ -22,7 +22,7 @@
 from bzrlib.workingtree import WorkingTree
 from bzrlib.bzrdir import BzrDir
 
-__version__ = '0.11.0'
+__version__ = '0.12.0'
 
 class cmd_gbranch(Command):
     """GTK+ branching.

=== modified file 'olive/__init__.py'
--- a/olive/__init__.py	2006-11-03 23:27:31 +0000
+++ b/olive/__init__.py	2006-11-04 19:21:29 +0000
@@ -36,7 +36,7 @@
 from bzrlib.workingtree import WorkingTree
 
 # Olive GTK UI version
-__version__ = '0.11.0'
+__version__ = '0.12.0'
 
 from dialog import error_dialog, info_dialog
 from guifiles import GLADEFILENAME