- Committer: Vincent Ladeuil
- Date: 2017-01-17 13:48:10 UTC
- mfrom: (6615.3.6 merges)
- Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
tests
|
6282.3.1 | 12 years ago | Vincent Ladeuil | First cut at a working plugin to avoid conflicts i |
|
||
__init__.py |
6391.1.1 | 12 years ago | Benjamin Peterson | fix copy and paste error | 3 KB |
|
|
|
po_merge.py |
6385.1.3 | 12 years ago | Vincent Ladeuil | Merge trunk resolving conflicts | 6.8 KB |
|
|
|
README |
6282.3.12 | 12 years ago | Vincent Ladeuil | Better fix README, add 'debian/po' to the 'po_merg | 280 bytes |
|
|