| commit | 0dd3e1d66682c0b7cec3d444ab6b77f089ad1254 | |
| author | David Aguilar <davvid@gmail.com> | |
| Tue, 1 Jul 2008 08:30:45 +0000 (1 01:30 -0700) | ||
| committer | David Aguilar <davvid@gmail.com> | |
| Tue, 1 Jul 2008 08:30:45 +0000 (1 01:30 -0700) | ||
| tree | 4e5bde7efd87deb9ca2a1c9128a1978cf990e558 | treesnapshot (tar.gz zip) |
| parent | f7b7dbba142dd327d3590d7a82dd91dba8b50397 | commitdiff |
| parent | 97b1749b2b3509e59a8bcce3832237b164c30631 | commitdiff |
Merge branch 'master' into release
* master:
controllers: add support for using the diff editor to compare branches
ui: add a Branch->Launch Diff Editor Against... menu item
models: properly detect copied files in parse_status()
controllers: when restoring selection prefer unstaged files
ui: add ItemsView and ComboView dialogs
views: reworked item selection dialogs
cola: centralized tmpfile management
* master:
controllers: add support for using the diff editor to compare branches
ui: add a Branch->Launch Diff Editor Against... menu item
models: properly detect copied files in parse_status()
controllers: when restoring selection prefer unstaged files
ui: add ItemsView and ComboView dialogs
views: reworked item selection dialogs
cola: centralized tmpfile management