- Committer: Jasper Groenewegen
- Date: 2008-07-25 18:45:04 UTC
- mfrom: (571.1.1 add-gmerge)
- Revision ID: colbrac@xs4all.nl-20080725184504-qdztpy93ftgg9jy1
Merge addition of gmerge command line option
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
annotate
|
49 | 18 years ago | Jelmer Vernooij | Merge in Dan Loda's gannotate plugin and put it in |
|
||
|
branchview
|
423.2.1 | 16 years ago | Daniel Schierbeck | Moved branch view to its own package. |
|
||
|
icons
|
0.8.31 | 17 years ago | Szilveszter Farkas (Phanatic) | Added new artwork. 2006-08-07 Szilveszter Farkas |
|
||
|
olive
|
0.8.10 | 17 years ago | Szilveszter Farkas (Phanatic) | 2006-07-16 Szilveszter Farkas <Szilveszter.Farkas |
|
||
|
po
|
0.8.55 | 17 years ago | Szilveszter Farkas (Phanatic) | Gettext support added. 2006-08-20 Szilveszter Fa |
|
||
|
preferences
|
450.3.1 | 16 years ago | Jelmer Vernooij | Add module for preferences code. |
|
||
|
tests
|
140 | 17 years ago | Jelmer Vernooij | add framework for tests. |
|
||
|
viz
|
48 | 18 years ago | Jelmer Vernooij | Move visualisation code to a separate directory, p |
|
||
.bzrignore |
511.3.2 | 15 years ago | Jelmer Vernooij | Show the credits of those who contributed in the A | 163 bytes |
|
|
|
__init__.py |
571.1.1 | 15 years ago | Jasper Groenewegen | Add gmerge command and change MergeDialog to set p | 20.3 KB |
|
|
|
about.py |
553.1.2 | 15 years ago | Jelmer Vernooij | Fix license path finding. | 2.2 KB |
|
|
|
AUTHORS |
567 | 15 years ago | Jelmer Vernooij | Clarify maintainers. | 973 bytes |
|
|
|
bazaar-properties.desktop |
223 | 16 years ago | Jelmer Vernooij | Add icon for Bazaar preferences. | 194 bytes |
|
|
|
branch.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 7.2 KB |
|
|
|
branchbox.py |
449.1.1 | 16 years ago | Jelmer Vernooij | Fix support for default value in BranchSelectionDi | 2.3 KB |
|
|
|
bzr-gtk.applications |
505.1.2 | 15 years ago | Jelmer Vernooij | Use helper script to open patches. | 203 bytes |
|
|
|
bzr-gtk.cfg |
411.1.2 | 16 years ago | Jelmer Vernooij | Fix URL. | 160 bytes |
|
|
bzr-handle-patch |
505.1.1 | 15 years ago | Jelmer Vernooij | Make handle-patch not dependend on the users name | 928 bytes |
|
|
|
bzr-handle-patch.desktop |
476.2.1 | 16 years ago | Jelmer Vernooij | Set suitable FDO categories in .desktop files | 265 bytes |
|
|
|
bzr-notify |
553.1.1 | 15 years ago | Jelmer Vernooij | Fix notify import. | 2.1 KB |
|
|
|
bzr-notify.desktop |
476.2.1 | 16 years ago | Jelmer Vernooij | Set suitable FDO categories in .desktop files | 251 bytes |
|
|
|
checkout.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 7.6 KB |
|
|
|
cmenu.ui |
235.1.4 | 16 years ago | Mateusz Korniak | Context menu "Remove and delete added" Acts like " | 1.2 KB |
|
|
|
commit.py |
500.2.2 | 15 years ago | Scott Scriven | Simpler/cleaner way to ignore the 'close' signal. | 30 KB |
|
|
|
conflicts.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 7.4 KB |
|
|
|
COPYING |
85 | 17 years ago | Jelmer Vernooij | Merge some files from Olive and bzr-gtk. | 17.5 KB |
|
|
|
create-credits.py |
511.3.2 | 15 years ago | Jelmer Vernooij | Show the credits of those who contributed in the A | 1015 bytes |
|
|
|
dialog.py |
463.2.2 | 16 years ago | Javier Derderian | Updated "Compare with..." (#78765) to use revbrows | 2 KB |
|
|
|
diff.py |
571 | 15 years ago | Jasper Groenewegen | Merge addition of word wrap control to gdiff and v | 24.5 KB |
|
|
|
errors.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 3.9 KB |
|
|
|
genpot.sh |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 1.2 KB |
|
|
|
HACKING |
533 | 15 years ago | Jelmer Vernooij | Add note about glade. | 642 bytes |
|
|
|
history.py |
225 | 16 years ago | Jelmer Vernooij | Add docstrings, remove unused code. | 1.6 KB |
|
|
|
initialize.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 4.5 KB |
|
|
|
MANIFEST.in |
1 | 18 years ago | Scott James Remnant | Commit the first version of bzrk. | 32 bytes |
|
|
|
merge.py |
571.1.1 | 15 years ago | Jasper Groenewegen | Add gmerge command and change MergeDialog to set p | 4.1 KB |
|
|
|
mergedirective.py |
449.1.2 | 16 years ago | Jelmer Vernooij | Honor child_submit_to in the submit_branch if no e | 4.1 KB |
|
|
|
missing.py |
412.1.12 | 16 years ago | Daniel Schierbeck | Fixed bug in gmissing. | 2.6 KB |
|
|
|
nautilus-bzr.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 14.6 KB |
|
|
|
NEWS |
572 | 15 years ago | Jasper Groenewegen | Merge addition of gmerge command line option | 16.3 KB |
|
|
|
notify.py |
553.1.3 | 15 years ago | Jelmer Vernooij | Use absolute imports. | 3 KB |
|
|
|
olive-gtk |
423.1.21 | 16 years ago | Szilveszter Farkas (Phanatic) | Installing an olive package is pretty useless. (Fi | 2.6 KB |
|
|
|
olive-gtk.1 |
476.3.1 | 16 years ago | Jelmer Vernooij | Import Chris Lamb's olive-gtk manpage. | 467 bytes |
|
|
|
olive-gtk.desktop |
498 | 15 years ago | Martin Albisetti | Add GTK;GNOME; to olive-gtk.desktop Categories | 377 bytes |
|
|
|
push.py |
562 | 15 years ago | Jasper Groenewegen | Merge removal of question to set default push loca | 5.9 KB |
|
|
|
README |
442.2.1 | 16 years ago | Jelmer Vernooij | Add note about python-nautilus requiring a libpyth | 4.7 KB |
|
|
|
revbrowser.py |
475.1.2 | 16 years ago | Vincent Ladeuil | Fix bug #187283 fix replacing _() by _i18n(). * g | 2.8 KB |
|
|
|
revidbox.py |
231 | 16 years ago | Jelmer Vernooij | Add RevisionSelectionBox widget, use in TagDialog. | 2.1 KB |
|
|
|
revisionmenu.py |
530 | 15 years ago | Jelmer Vernooij | Share code between context and main revision menu. | 4.9 KB |
|
|
|
revisionview.py |
531.7.7 | 15 years ago | Scott Scriven | Fixed labels/buttons overflowing their parent widg | 25.5 KB |
|
|
|
seahorse.py |
511.1.2 | 15 years ago | Jelmer Vernooij | Return cleartext from seahorse module | 3.7 KB |
|
|
|
search.py |
555.1.2 | 15 years ago | Jasper Groenewegen | Better way to return response | 3.9 KB |
|
|
|
setup.py |
568.1.1 | 15 years ago | Jasper Groenewegen | Add missing icon to setup.py to prevent Olive cras | 5.6 KB |
|
|
|
status.py |
531.1.1 | 15 years ago | Vincent Geddes | Improved visual appeal of gstatus dialog. * statu | 4.6 KB |
|
|
|
tags.py |
494 | 16 years ago | Szilveszter Farkas (Phanatic) | Merged fix for #228709 by Javier. | 12.3 KB |
|
|
|
TODO |
263.2.1 | 16 years ago | matkor | Code for "branch update" menuitem and toolbox. Typ | 1.5 KB |
|
|
|
ui.py |
533.10.1 | 15 years ago | Jelmer Vernooij | Consider 0 a valid value for progress bars. | 7 KB |
|
|
|
window.py |
298.2.2 | 16 years ago | Daniel Schierbeck | Added the new Window base class. | 601 bytes |
|
|