diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-04-19 07:02:53 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-04-19 07:02:53 +0000 |
| commit | 8fb673afd6f42182468b3907623561b09ae6935e (patch) | |
| tree | bad8d6c80b825dbc7df0916903b5574059f1d50c | |
| parent | Update to trunk (diff) | |
| download | inkscape-8fb673afd6f42182468b3907623561b09ae6935e.tar.gz inkscape-8fb673afd6f42182468b3907623561b09ae6935e.zip | |
Icons coflict resolved
(bzr r11950.1.104)
| -rw-r--r-- | share/icons/icons.svg | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/share/icons/icons.svg b/share/icons/icons.svg index db31c6b2c..91204b4a7 100644 --- a/share/icons/icons.svg +++ b/share/icons/icons.svg @@ -5630,9 +5630,9 @@ inkscape:window-x="0" inkscape:window-height="901" inkscape:window-width="1280" - inkscape:cy="477.6024" - inkscape:cx="940.66887" - inkscape:zoom="21.59375" + inkscape:cy="473.2422" + inkscape:cx="936.13246" + inkscape:zoom="5.3984375" gridtolerance="6" snaptogrid="false" showgrid="false" @@ -5671,8 +5671,7 @@ empspacing="2" visible="true" enabled="true" - snapvisiblegridlinesonly="true" - dotted="false" /> + snapvisiblegridlinesonly="true" /> <sodipodi:guide orientation="0,1" position="630.08101,968.02815" |
