Skip to content

Commit 5fea5a8

Browse files
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents ffed1d7 + 9784cd7 commit 5fea5a8

File tree

143 files changed

+7811
-787
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+7811
-787
lines changed

images/images.qrc

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
<file>themes/default/geographic.png</file>
1414
<file>themes/default/gpsicons/barchart.svg</file>
1515
<file>themes/default/gpsicons/polarchart.svg</file>
16+
<file>themes/default/grass_location.png</file>
17+
<file>themes/default/grass_mapset.png</file>
1618
<file>themes/default/join_bevel.png</file>
1719
<file>themes/default/join_miter.png</file>
1820
<file>themes/default/join_round.png</file>
@@ -178,6 +180,8 @@
178180
<file>themes/default/mIconTableLayer.png</file>
179181
<file>themes/default/mIconUnknownLayerType.png</file>
180182
<file>themes/default/mIconWaitingForLayerType.png</file>
183+
<file>themes/default/mIconWms.png</file>
184+
<file>themes/default/mIconWmsLayer.png</file>
181185
<file>themes/default/mMapserverExport.png</file>
182186
<file>themes/default/plugin.png</file>
183187
<file>themes/default/propertyicons/action.png</file>
968 Bytes
817 Bytes
518 Bytes
853 Bytes
1.18 KB
672 Bytes
1.11 KB
978 Bytes
1003 Bytes

0 commit comments

Comments
 (0)