diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-03 21:35:23 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-03 21:35:23 +0000 |
| commit | 67fa2b7c2a26e909b1adb5fb188285367dfba7e4 (patch) | |
| tree | 83fc014c6907d8273f77646225d7cbe8854be85f /src/main.cpp | |
| parent | Update to trunk (diff) | |
| download | inkscape-67fa2b7c2a26e909b1adb5fb188285367dfba7e4.tar.gz inkscape-67fa2b7c2a26e909b1adb5fb188285367dfba7e4.zip | |
Fix merge bugs
(bzr r15017.1.36)
Diffstat (limited to 'src/main.cpp')
0 files changed, 0 insertions, 0 deletions