[Pkg-bazaar-commits] ./bzr-gtk/unstable r160: Merge trunk
Jelmer Vernooij
jelmer at samba.org
Fri Apr 10 07:45:40 UTC 2009
------------------------------------------------------------
revno: 160
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Tue 2007-03-06 14:48:35 +0100
message:
Merge trunk
removed:
po/hu.po
added:
conflicts.py
modified:
__init__.py
annotate/gannotate.py
commit.py
dialog.py
genpot.sh
olive-gtk
olive.glade
olive/__init__.py
po/olive-gtk.pot
setup.py
status.py
------------------------------------------------------------
revno: 157.1.1
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: sent
timestamp: Sat 2007-02-03 18:01:18 +0100
message:
Use ScrolledWindow in gstatus.
modified:
status.py
------------------------------------------------------------
revno: 157.1.2
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sat 2007-02-03 18:54:00 +0100
message:
Merge conflicts stuff.
added:
conflicts.py
modified:
__init__.py
------------------------------------------------------------
revno: 126.1.23
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sat 2007-02-03 18:16:46 +0100
message:
Merge from trunk.
removed:
viz/bzrkapp.py
added:
bzr-icon-64.png
history.py
tests/test_history.py
tests/test_preferences.py
renamed:
annotate/logview.py => logview.py
olive/branch.py => branch.py
olive/checkout.py => checkout.py
olive/commit.py => commit.py
olive/dialog.py => dialog.py
olive/errors.py => errors.py
olive/merge.py => merge.py
olive/push.py => push.py
olive/revbrowser.py => revbrowser.py
olive/status.py => status.py
olive/ui.py => ui.py
viz/diffwin.py => diff.py
modified:
__init__.py
annotate/gannotate.py
nautilus-bzr.py
olive-gtk
olive/__init__.py
olive/add.py
olive/bookmark.py
olive/info.py
olive/menu.py
olive/mkdir.py
olive/move.py
olive/remove.py
olive/rename.py
tests/__init__.py
viz/branchwin.py
logview.py
branch.py
checkout.py
commit.py
dialog.py
errors.py
merge.py
push.py
revbrowser.py
status.py
------------------------------------------------------------
revno: 126.1.24
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sat 2007-02-03 18:19:29 +0100
message:
Implemented Conflicts dialog. Added gconflicts command.
added:
conflicts.py
modified:
__init__.py
------------------------------------------------------------
revno: 157.1.3
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sun 2007-02-04 13:47:21 +0100
message:
Added Conflicts menu entry. Some trivial fixes.
modified:
dialog.py
olive-gtk
olive.glade
olive/__init__.py
------------------------------------------------------------
revno: 126.1.25
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-04 11:53:57 +0100
message:
Merge from trunk.
------------------------------------------------------------
revno: 126.1.26
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-04 13:05:45 +0100
message:
Added Conflicts entry to the Branch menu.
modified:
olive.glade
olive/__init__.py
------------------------------------------------------------
revno: 126.1.27
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-04 13:11:31 +0100
message:
Some trivial fixes regarding module imports.
modified:
dialog.py
olive-gtk
------------------------------------------------------------
revno: 157.1.4
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sun 2007-02-04 14:47:56 +0100
message:
Fix for Commit dialog and Diff window.
modified:
commit.py
------------------------------------------------------------
revno: 126.1.28
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-04 14:47:26 +0100
message:
The Diff window won't freeze when calling from the Commit dialog.
modified:
commit.py
------------------------------------------------------------
revno: 157.1.5
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: gtk
timestamp: Thu 2007-02-15 11:56:15 -0500
message:
Use lazy_import to reduce rocks time by .015s
modified:
__init__.py
------------------------------------------------------------
revno: 157.1.6
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: gtk
timestamp: Thu 2007-02-15 13:55:47 -0500
message:
Defer importing branchwin to avoid cairo import errors
modified:
olive/__init__.py
------------------------------------------------------------
revno: 157.1.7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: gtk
timestamp: Thu 2007-02-15 14:07:43 -0500
message:
Fix branch-nick handling
modified:
annotate/gannotate.py
------------------------------------------------------------
revno: 157.1.8
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sat 2007-02-17 13:24:18 +0100
message:
Merge Vincent's regression fix.
modified:
__init__.py
------------------------------------------------------------
revno: 157.2.1
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: gtk
timestamp: Sat 2007-02-17 10:02:59 +0100
message:
Rename variable 'branch' to 'br' where it conflicts with 'branch' module
modified:
__init__.py
------------------------------------------------------------
revno: 157.1.9
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: trunk
timestamp: Sat 2007-03-03 14:11:06 +0100
message:
Merge from integration branch.
removed:
po/hu.po
modified:
commit.py
genpot.sh
po/olive-gtk.pot
setup.py
------------------------------------------------------------
revno: 126.1.29
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-04 19:28:46 +0100
message:
Default button set on Commit dialog (Fixed: #83030)
modified:
commit.py
------------------------------------------------------------
revno: 126.1.30
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-04 21:58:20 +0100
message:
Added the ability to install the Nautilus plugin (Fixed: #75603)
modified:
setup.py
------------------------------------------------------------
revno: 126.1.31
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Fri 2007-02-16 18:14:55 +0100
message:
We also support other versions than 2.4.
modified:
setup.py
------------------------------------------------------------
revno: 126.1.32
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Fri 2007-02-16 18:17:28 +0100
message:
Updated genpot.sh. Regenerated POT file. Old Hungarian translation removed.
We have to encourage people to translate bzr-gtk/Olive through Rosetta. (The Olive product is already translatable, but bzr-gtk is still not.)
removed:
po/hu.po
modified:
genpot.sh
po/olive-gtk.pot
------------------------------------------------------------
revno: 126.1.33
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Sun 2007-02-18 22:36:28 +0100
message:
Merge from trunk.
modified:
__init__.py
annotate/gannotate.py
olive/__init__.py
------------------------------------------------------------
revno: 126.1.34
committer: Szilveszter Farkas (Phanatic) <Szilveszter.Farkas at gmail.com>
branch nick: bzr-gtk
timestamp: Fri 2007-03-02 17:02:56 +0100
message:
Install test suite.
modified:
setup.py
-------------- next part --------------
Diff too large for email (3413 lines, the limit is 1000).
More information about the Pkg-bazaar-commits
mailing list