To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Aaron Bentley
- Date: 2006-04-08 23:57:33 UTC
- mto: (1731.2.9 nested-trees) (2234.6.1 bzr.0.14) (2229.2.4 reserved-ids) (2323.6.9 0.15-integration) (1551.19.24 Aaron's mergeable stuff)
- Revision ID: aaron.bentley@utoronto.ca-20060408235733-555b6583f267b843
Indicate conflicts from merge_lines, insead of guessing
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
1558.8.1 | 19 years ago | Aaron Bentley | Fix overall progress bar's interaction with 'note' | 3.4 KB |
|
|
|
text.py |
1558.8.1 | 19 years ago | Aaron Bentley | Fix overall progress bar's interaction with 'note' | 2.5 KB |
|
|