- Committer: Vincent Ladeuil
- Date: 2010-02-10 15:46:03 UTC
- mfrom: (4985.3.21 update)
- Revision ID: v.ladeuil+lp@free.fr-20100210154603-k4no1gvfuqpzrw7p
Update performs two merges in a more logical order but stop on conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
__init__.py |
4961.2.20 | 14 years ago | Martin Pool | Resolve conflicts with trunk | 12.5 KB |
|
|
|
text.py |
4961.2.20 | 14 years ago | Martin Pool | Resolve conflicts with trunk | 18.5 KB |
|
|