- Committer: Canonical.com Patch Queue Manager
- Date: 2006-07-02 19:48:18 UTC
- mfrom: (1551.7.13 Aaron's mergeable stuff)
- Revision ID: pqm@pqm.ubuntu.com-20060702194818-ba2ec54220591dcf
Remerge doesn't clobber conflicts on other files
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
bzrlib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
contrib
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
doc
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
|
tools
|
1185.1.29 | 19 years ago | Robert Collins | merge merge tweaks from aaron, which includes late |
|
||
.bzrignore |
1534.7.158 | 18 years ago | Aaron Bentley | Merged John Meinel's integration | 202 bytes |
|
|
|
.rsyncexclude |
1185.33.36 | 18 years ago | Martin Pool | Exclude more files from dumb-rsync upload | 203 bytes |
|
|
|
BRANCH.TODO |
1185.82.134 | 18 years ago | Aaron Bentley | Merge from bzr.dev | 220 bytes |
|
|
|
build-api |
1185.33.32 | 18 years ago | Martin Pool | [merge] fix \t in commit messages | 100 bytes |
|
|
bzr |
1724.2.14 | 18 years ago | John Arbash Meinel | Refactor import stuff into separate functions. Upd | 2.6 KB |
|
|
|
generate_docs.py |
1534.7.158 | 18 years ago | Aaron Bentley | Merged John Meinel's integration | 2.7 KB |
|
|
|
HACKING |
1740.6.2 | 18 years ago | Martin Pool | [merge] bzr.dev | 16.2 KB |
|
|
|
INSTALL |
1185.16.80 | 19 years ago | Martin Pool | Update news and readme - better explanation of de | 437 bytes |
|
|
|
Makefile |
1773.4.1 | 18 years ago | Martin Pool | Add pyflakes makefile target; fix many warnings | 760 bytes |
|
|
|
NEWS |
1551.7.9 | 18 years ago | Aaron Bentley | Update for review comments | 56.1 KB |
|
|
|
NEWS.developers |
1185.16.35 | 19 years ago | Martin Pool | - stub for revision properties | 910 bytes |
|
|
|
profile_imports.py |
1724.2.14 | 18 years ago | John Arbash Meinel | Refactor import stuff into separate functions. Upd | 4.9 KB |
|
|
|
README |
1610.1.9 | 18 years ago | Martin Pool | Update version numbers | 808 bytes |
|
|
|
setup.py |
1801.1.1 | 18 years ago | Jelmer Vernooij | Install benchmarks. | 3.8 KB |
|
|
|
TODO |
1185.82.134 | 18 years ago | Aaron Bentley | Merge from bzr.dev | 15.7 KB |
|
|