Rev 160: Merge trunk in file:///home/jelmer/bzr-gtk/trunk/
Jelmer Vernooij
jelmer at samba.org
Tue Mar 6 13:48:39 GMT 2007
At file:///home/jelmer/bzr-gtk/trunk/
------------------------------------------------------------
revno: 160
revision-id: jelmer at samba.org-20070306134835-4e3gg9sq0ovvzwad
parent: jelmer at samba.org-20070203170025-oneu0nbsup6p1mj1
parent: szilveszter.farkas at gmail.com-20070303131106-m29gfar0hci11k2y
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 hu.po-20060820124246-vi2tip5o5mcnyza1-4
added:
conflicts.py conflicts.py-20070203171806-g5tuxmkf2suxgzvm-1
modified:
__init__.py __init__.py-20060519165329-a1fd52c8a829fcd5
annotate/gannotate.py xannotate.py-20051024072750-fe35acd6bb909bd3
commit.py commit.py-20060721181724-0mfkrqwpsa09q1t3-3
dialog.py dialog.py-20060717135918-egb4rf35n4b9trom-2
genpot.sh genpot.sh-20060820124246-vi2tip5o5mcnyza1-2
olive-gtk olivegtk-20060716233821-osq2ryyn2ht8pe91-1
olive.glade olive.glade-20060716235030-brgx1ry6lt6z8044-1
olive/__init__.py __init__.py-20060925014013-13wdvwl8vi8gfqi1-2
po/olive-gtk.pot olivegtk.pot-20060820124246-vi2tip5o5mcnyza1-3
setup.py setup.py-20060716162505-h2isrtlg8lmlg2o2-1
status.py status.py-20060803143043-mmdp58hu3hauy0xh-1
------------------------------------------------------------
revno: 157.1.9
merged: szilveszter.farkas at gmail.com-20070303131106-m29gfar0hci11k2y
parent: szilveszter.farkas at gmail.com-20070217122418-fyxhtwn7la6nytyi
parent: szilveszter.farkas at gmail.com-20070302160256-3ogad8cnunmq2h2f
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.
------------------------------------------------------------
revno: 126.1.34
merged: szilveszter.farkas at gmail.com-20070302160256-3ogad8cnunmq2h2f
parent: szilveszter.farkas at gmail.com-20070218213628-nyex0audbsr001u0
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.
------------------------------------------------------------
revno: 126.1.33
merged: szilveszter.farkas at gmail.com-20070218213628-nyex0audbsr001u0
parent: szilveszter.farkas at gmail.com-20070216171728-i97utnlbukrkvzli
parent: szilveszter.farkas at gmail.com-20070217122418-fyxhtwn7la6nytyi
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.
------------------------------------------------------------
revno: 126.1.32
merged: szilveszter.farkas at gmail.com-20070216171728-i97utnlbukrkvzli
parent: szilveszter.farkas at gmail.com-20070216171455-6xcs2o23b3oucp6r
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.)
------------------------------------------------------------
revno: 126.1.31
merged: szilveszter.farkas at gmail.com-20070216171455-6xcs2o23b3oucp6r
parent: szilveszter.farkas at gmail.com-20070204205820-gybpvua4rrwtn3bh
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.
------------------------------------------------------------
revno: 126.1.30
merged: szilveszter.farkas at gmail.com-20070204205820-gybpvua4rrwtn3bh
parent: szilveszter.farkas at gmail.com-20070204182846-ko4r7rf4wr09eizt
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)
------------------------------------------------------------
revno: 126.1.29
merged: szilveszter.farkas at gmail.com-20070204182846-ko4r7rf4wr09eizt
parent: szilveszter.farkas at gmail.com-20070204134726-tghtzdg7rwblzbze
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)
------------------------------------------------------------
revno: 157.1.8
merged: szilveszter.farkas at gmail.com-20070217122418-fyxhtwn7la6nytyi
parent: abentley at panoramicfeedback.com-20070215190743-6frvfe7bardan3lx
parent: v.ladeuil+lp at free.fr-20070217090259-kmay8g9eu688qw0l
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.
------------------------------------------------------------
revno: 157.1.7.1.1
merged: v.ladeuil+lp at free.fr-20070217090259-kmay8g9eu688qw0l
parent: abentley at panoramicfeedback.com-20070215190743-6frvfe7bardan3lx
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
------------------------------------------------------------
revno: 157.1.7
merged: abentley at panoramicfeedback.com-20070215190743-6frvfe7bardan3lx
parent: abentley at panoramicfeedback.com-20070215185547-npzcf248qp9a6fqk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: gtk
timestamp: Thu 2007-02-15 14:07:43 -0500
message:
Fix branch-nick handling
------------------------------------------------------------
revno: 157.1.6
merged: abentley at panoramicfeedback.com-20070215185547-npzcf248qp9a6fqk
parent: abentley at panoramicfeedback.com-20070215165615-3c8jyp7h91gsy0x0
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
------------------------------------------------------------
revno: 157.1.5
merged: abentley at panoramicfeedback.com-20070215165615-3c8jyp7h91gsy0x0
parent: szilveszter.farkas at gmail.com-20070204134756-u91j3mphxkaq4uqk
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
------------------------------------------------------------
revno: 157.1.4
merged: szilveszter.farkas at gmail.com-20070204134756-u91j3mphxkaq4uqk
parent: szilveszter.farkas at gmail.com-20070204124721-jh1w0e7tfr15i56k
parent: szilveszter.farkas at gmail.com-20070204134726-tghtzdg7rwblzbze
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.
------------------------------------------------------------
revno: 126.1.28
merged: szilveszter.farkas at gmail.com-20070204134726-tghtzdg7rwblzbze
parent: szilveszter.farkas at gmail.com-20070204121131-fikodh5efn2jgi81
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.
------------------------------------------------------------
revno: 157.1.3
merged: szilveszter.farkas at gmail.com-20070204124721-jh1w0e7tfr15i56k
parent: szilveszter.farkas at gmail.com-20070203175400-52qxvu3qec9u11cw
parent: szilveszter.farkas at gmail.com-20070204121131-fikodh5efn2jgi81
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.
------------------------------------------------------------
revno: 126.1.27
merged: szilveszter.farkas at gmail.com-20070204121131-fikodh5efn2jgi81
parent: szilveszter.farkas at gmail.com-20070204120545-o7rxnkmhjctvkhnb
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.
------------------------------------------------------------
revno: 126.1.26
merged: szilveszter.farkas at gmail.com-20070204120545-o7rxnkmhjctvkhnb
parent: szilveszter.farkas at gmail.com-20070204105357-qm0m9om0xu4hqem9
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.
------------------------------------------------------------
revno: 126.1.25
merged: szilveszter.farkas at gmail.com-20070204105357-qm0m9om0xu4hqem9
parent: szilveszter.farkas at gmail.com-20070203171929-6egi16ulzmkg9g1g
parent: szilveszter.farkas at gmail.com-20070203175400-52qxvu3qec9u11cw
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: 157.1.2
merged: szilveszter.farkas at gmail.com-20070203175400-52qxvu3qec9u11cw
parent: jelmer at samba.org-20070203170118-cq3ggzxo0zn55olz
parent: szilveszter.farkas at gmail.com-20070203171929-6egi16ulzmkg9g1g
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.
------------------------------------------------------------
revno: 126.1.24
merged: szilveszter.farkas at gmail.com-20070203171929-6egi16ulzmkg9g1g
parent: szilveszter.farkas at gmail.com-20070203171646-kdu7bhpz3mctcaai
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.
------------------------------------------------------------
revno: 126.1.23
merged: szilveszter.farkas at gmail.com-20070203171646-kdu7bhpz3mctcaai
parent: szilveszter.farkas at gmail.com-20070201164153-stejk9qeqtqduz9j
parent: jelmer at samba.org-20070203170118-cq3ggzxo0zn55olz
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.
------------------------------------------------------------
revno: 157.1.1
merged: jelmer at samba.org-20070203170118-cq3ggzxo0zn55olz
parent: jelmer at samba.org-20070203160446-r7xksl3qe108vhm3
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: sent
timestamp: Sat 2007-02-03 18:01:18 +0100
message:
Use ScrolledWindow in gstatus.
Diff too large for email (3413 lines, the limit is 1000).
More information about the bazaar-commits
mailing list