Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:qgis/Quantum-GIS

  • Loading branch information
etiennesky committed Aug 6, 2012
2 parents 6861078 + 2752f66 commit fbbb71a490ad4cedcbee87949cce4b0625646412
@@ -77,7 +77,7 @@
<file>themes/default/mActionFileSmall.png</file>
<file>themes/default/mActionFolder.png</file>
<file>themes/default/mActionFormAnnotation.png</file>
<file>themes/default/mActionFreezeLabels.png</file>
<file>themes/default/mActionFreezeLabels.svg</file>
<file>themes/default/mActionFromSelectedFeature.png</file>
<file>themes/default/mActionFullCumulativeCutStretch.png</file>
<file>themes/default/mActionFullHistogramStretch.png</file>
@@ -149,7 +149,7 @@
<file>themes/default/mActionSelectRectangle.png</file>
<file>themes/default/mActionShowAllLayers.png</file>
<file>themes/default/mActionShowBookmarks.png</file>
<file>themes/default/mActionShowFrozenLabels.png</file>
<file>themes/default/mActionShowFrozenLabels.svg</file>
<file>themes/default/mActionShowPluginManager.png</file>
<file>themes/default/mActionSimplify.png</file>
<file>themes/default/mActionSplitFeatures.png</file>
@@ -294,6 +294,7 @@
<file>themes/gis/mActionFileSave.png</file>
<file>themes/gis/mActionFolder.png</file>
<file>themes/gis/mActionFormAnnotation.png</file>
<file>themes/gis/mActionFreezeLabels.svg</file>
<file>themes/gis/mActionGroupItems.png</file>
<file>themes/gis/mActionHelpContents.png</file>
<file>themes/gis/mActionHideAllLayers.png</file>
@@ -346,6 +347,7 @@
<file>themes/gis/mActionSelectRectangle.png</file>
<file>themes/gis/mActionShowAllLayers.png</file>
<file>themes/gis/mActionShowBookmarks.png</file>
<file>themes/gis/mActionShowFrozenLabels.svg</file>
<file>themes/gis/mActionSimplify.png</file>
<file>themes/gis/mActionSplitFeatures.png</file>
<file>themes/gis/mActionSplitFeatures.svg</file>
@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg3071"
version="1.1"
inkscape:version="0.48.2 r9819"
width="32"
height="32"
sodipodi:docname="mActionFreezeLabels2.png">
<metadata
id="metadata3077">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3075" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1916"
inkscape:window-height="1156"
id="namedview3073"
showgrid="false"
inkscape:zoom="29.3125"
inkscape:cx="16"
inkscape:cy="16"
inkscape:window-x="4"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg3071" />
<image
width="32"
height="32"
xlink:href="data:image/png;base64,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
"
id="image3079"
x="0"
y="0" />
</svg>
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->

<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
id="svg3140"
version="1.1"
inkscape:version="0.48.2 r9819"
width="32"
height="32"
sodipodi:docname="mActionShowFrozenLabels3.png">
<metadata
id="metadata3146">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs3144" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1916"
inkscape:window-height="1156"
id="namedview3142"
showgrid="false"
inkscape:zoom="7.375"
inkscape:cx="16"
inkscape:cy="16"
inkscape:window-x="4"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg3140" />
<image
width="32"
height="32"
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAABmJJREFU
WIXF12tsnXUdB/DPOT2nOz29nLl1o8AYbK2Mwda5ueEcwakgyxJHFiD6wikQNYYZnATfrDNoeKHR
SAzDiNH4wgsajQk6wWAJrJWxad3cZIwhjBXoyljX63o59/P44nk6a1fIxl7wS05y8vs/z+/3/f+u
3ycWBIH3U+Lvq3ckYM6cORfz/q2owgEcv5CXBwcHQwAXIWU0CCNZ9V4MnC+A+sjZxDR9Gvcihn68
eqEAzqcGYvgufoWl087G0YRGDE87uwN/wcqLBRBERm7DZ4XRaESrMP91wjTcFAHMRGfbsBFz3834
+aZgVwRis/Cmi/FJXIXa6Jk2bMIzuAarcRhHLgRADItwAoUp+qPowwp8X1hw06OXCEHGlhMkMIon
cTI6rxJGqFuYuhkBtOI36BSGsCgM4724DKoT8eSN16+x8sOrNTReIlvIi5WLZqeSauvqDI3nEr/7
w+MOH36hHrdEII7iy/gqtuKpyPY5AIpYiHui/3vwAJY1zZ/vE+s/5vpVrS65ZoVY0xJjsYTxUkVt
Im7pnBpLG2sExZyW5hY7H/2Jvc8/v0pYwK/hU9ElJlA6G/IgCKYPos/gUZxVXnnlVe6/b5stX7gT
7B8Y99dXR3SP5J04U5AvBpZkUm5ZmHJz82wN6ZR9e/fY8c0HHDp0aNJMFtvx8KRicHBwRgDwa3wO
Nm/e7P77vu665a3gFy/2Uy67YWHGrKq4nx446V89IwYGxzUmKu64LmPj0kb1qZiOvfvt3PkjXV3/
gEO4C/+eCmCmNlyFFtiyZYsdO9rOOn/pdNbTx067tD6p5QMpVzRUW14fSGXHVIay+gaz/nTwlK5X
3lIpFrQuX2bbtq9Zu/ajcHWU2v/zOR3AInwnFot9ZNOmTdra2jQ3t4DRfNG+nkFvDE3Il8INGlRK
Tp3oMdr7hlJuSDII9HTnHHlzRO+pfoXchNWrV7v99tu0tLSk8RV8XjgbGvhfEc7FbNyNDStWrLB1
61ZNTU2ho6BiLJvXdyanXKzY/eppmSBvbGhA+/6X9b01KFU3T5BMC0pFp4cL+obG1c4aNzw6YeXK
lTZs2ODYsWPwDeEceQWPTQK4GtdiA6xbt86aNWvOhiUoFYzlwl86HnfwWJ+jB16QGzzlTLYgVgko
FlUmCoJyyciZvJHxpJqquKGRAZdfvsCSJUs0Nzc7fvz4siAIEngJj02m4BU8jd/D7t27dXR0TMlM
ICgWxAolpXzZ2JmcvoERb58aUMwVKBUVswWF8YKgUpKMV8QqZflCQTKZNDo6qru7W29vryAIjuKP
wj1xtgYG8Kaw/X559OjR3COPPOL1118PCyWZkq4iEy8rjmYpBdLVaelUWrxUVinGlEpxQblEUDG7
hnR1WbFcUVdX5+DBg9rb2+VyuTx+gIfw2ExFOIb7sa+zs9ODDz7o5Zf/I6iUza6ttrghoV6JfKBY
SYklMgQplVidWCJcCckq5tXFpKvjAlX6+wd0dHQ6cuQItAu3aj9yMwEQHb4Bu3btsn37dl1d/1SX
meNjyxa4bn6NylheYYxykGHWPFU1c8USKYJA64KEK+cmZDIZ4gnt7U/r6uoiZExtohE8KdNHcVK4
A25FsVKpHOns7PjQxMSEL921xcfXr3fXjQtlauo8c6DPeDYnKM9CoDoRs3px2sbWOs2X1TlxoteT
Tz3jiSf+bHh4iLDLzmFN0yfhtdgf/f8enhcukQ1XLFiQ+fTGW1y/arl86lKHT8a89nZWRZVkVczi
xrhllwYuqQ/09J7U/uwez/2t0/DwcE900SDKe5toF8w0itfg53gc34p0DdiJO6Fp/lw3rV9nUfMH
TZRTVDdobEiqrcobGjitu/e05/bsc/z4a/AWvh05vCmK8N0iajcTgBiuiOpgKv/7YhSRuRiNx9Sn
ZlVLp2vUpmvEqxKyubzxiax8vqBQKBDu/R34bWRjfpSCSX4wIysOhO04XW6InD+OhyuBeRO5ws0T
ucKK/sGRtcJNtxcv4pRw2i0SrvZJ6ZvB7nlRsnQEAH4sJCuELbUZa4XfAw/hWeSFBXePkJalncum
LwhAg7CF/o6uKfozQsJCGLV9kXP4GQaREqb1HeV8ALwt7ITAuTdJYCR6ZmqLHcMPI+d57yLny4rH
30E/IuR8B0STbYoUzn38XLnYj9MCXkAPKu/FQOz9/jz/L8dRhkROrskeAAAAAElFTkSuQmCC
"
id="image3148"
x="0"
y="0" />
</svg>

0 comments on commit fbbb71a

Please sign in to comment.
You can’t perform that action at this time.