Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into blend_modes
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Mar 27, 2013
2 parents 8793d38 + d1825ec commit c9ef27c
Show file tree
Hide file tree
Showing 88 changed files with 11,609 additions and 1,848 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
* add support for ubuntu quantal and raring
* remove js files and add libjs-jquery/libjs-underscore dependency
* add spatialite qt sql driver
* include topology plugin

-- Jürgen E. Fischer <jef@norbit.de> Thu, 21 Feb 2013 12:11:31 +0100
-- Jürgen E. Fischer <jef@norbit.de> Wed, 27 Mar 2013 11:03:31 +0100

qgis (1.8.0) UNRELEASED; urgency=low

Expand Down
1 change: 1 addition & 0 deletions debian/qgis.install
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ usr/lib/qgis/plugins/libofflineeditingplugin.so
usr/lib/qgis/plugins/libroadgraphplugin.so
usr/lib/qgis/plugins/libzonalstatisticsplugin.so
usr/lib/qgis/plugins/libheatmapplugin.so
usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/qgis_help
usr/share/pixmaps/qgis-icon.xpm
usr/share/pixmaps/qgis-mime-icon.png
Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</td>
<td valign="center">
<span class="header">Quantum GIS Documentation</span><br>
<span class="subheader">Version 1.7.0 <i>Wrocław</i></span><br>
<span class="subheader">Use Help inside functions or:</span><br>
<span class="warning">You can find a <a href="http://www.qgis.org/en/documentation/manuals.html">PDF manual of the current version</a> on the QGIS website.</span>
</td>
</tr>
Expand Down
8 changes: 8 additions & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@
<file>themes/gis/mActionFilePrint.png</file>
<file>themes/gis/mActionFileSaveAs.png</file>
<file>themes/gis/mActionFileSave.png</file>
<file>themes/gis/mActionFilter.svg</file>
<file>themes/gis/mActionFolder.png</file>
<file>themes/gis/mActionFormAnnotation.png</file>
<file>themes/gis/mActionGroupItems.png</file>
Expand Down Expand Up @@ -428,6 +429,7 @@
<file>themes/gis/plugins/dxf2shp_converter.png</file>
<file>themes/gis/plugins/gps_importer/create_gpx.png</file>
<file>themes/gis/plugins/gps_importer/import_gpx.png</file>
<file>themes/gis/plugins/gps_importer.png</file>
<file>themes/gis/plugins/interpolation.png</file>
<file>themes/gis/plugins/mapserver_export.png</file>
<file>themes/gis/plugins/mGeorefRun.png</file>
Expand Down Expand Up @@ -537,6 +539,12 @@
<file>flags/eu_ES.png</file>
<file>flags/ml_IN.png</file>
<file>flags/km.png</file>
<file>themes/gis/mIconExpressionFilter.svg</file>
<file>themes/gis/mIconExpressionPreview.svg</file>
<file>themes/gis/mIconExpressionSelect.svg</file>
<file>themes/gis/mIconSelectAdd.svg</file>
<file>themes/gis/mIconSelectIntersect.svg</file>
<file>themes/gis/mIconSelectRemove.svg</file>
</qresource>
<qresource prefix="/images/tips">
<file alias="symbol_levels.png">qgis_tips/symbol_levels.png</file>
Expand Down
Loading

0 comments on commit c9ef27c

Please sign in to comment.