To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
- Committer: Robert Collins
- Date: 2010-05-11 08:44:59 UTC
- mfrom: (5221 +trunk)
- Revision ID: robertc@robertcollins.net-20100511084459-pb0uinna9zs3wu59
Merge trunk - resolve conflicts.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4763.2.4 | 15 years ago | John Arbash Meinel | merge bzr.2.1 in preparation for NEWS entry. | 2.4 KB |
|
|
|
medusa_based.py |
5053.1.1 | 15 years ago | Martin Pool | Merge 2.1 back to trunk | 10 KB |
|
|
|
pyftpdlib_based.py |
5053.1.1 | 15 years ago | Martin Pool | Merge 2.1 back to trunk | 7.9 KB |
|
|