- Committer: Martin Packman
- Date: 2012-01-05 10:44:12 UTC
- mfrom: (6424 +trunk)
- Revision ID: martin.packman@canonical.com-20120105104412-z03fi9m43h946fvs
Merge bzr.dev to resolve conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
tests
|
6282.3.1 | 13 years ago | Vincent Ladeuil | First cut at a working plugin to avoid conflicts i |
|
||
__init__.py |
6391.1.1 | 13 years ago | Benjamin Peterson | fix copy and paste error | 3 KB |
|
|
|
po_merge.py |
6385.1.3 | 13 years ago | Vincent Ladeuil | Merge trunk resolving conflicts | 6.8 KB |
|
|
|
README |
6282.3.12 | 13 years ago | Vincent Ladeuil | Better fix README, add 'debian/po' to the 'po_merg | 280 bytes |
|
|