Skip to content

Commit 8bf3d18

Browse files
committed
Fix merge conflict
2 parents 83b571b + 2c7eff7 commit 8bf3d18

File tree

304 files changed

+88594
-34185
lines changed

Some content is hidden

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

304 files changed

+88594
-34185
lines changed

debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,9 @@ qgis (1.9.0) UNRELEASED; urgency=low
1414
* remove js files and add libjs-jquery/libjs-underscore dependency
1515
* add spatialite qt sql driver
1616
* include topology plugin
17+
* drop context_help, function_help and qgis_help.db files
1718

18-
-- Jürgen E. Fischer <jef@norbit.de> Wed, 27 Mar 2013 11:03:31 +0100
19+
-- Jürgen E. Fischer <jef@norbit.de> Thu, 16 May 2013 09:13:35 +0200
1920

2021
qgis (1.8.0) UNRELEASED; urgency=low
2122

debian/qgis-common.install

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,4 @@ usr/share/qgis/doc/INSTALL.html
1212
usr/share/qgis/doc/images
1313
usr/share/qgis/i18n/*
1414
usr/share/qgis/images/*
15-
usr/share/qgis/resources/context_help/*
16-
usr/share/qgis/resources/function_help/*
1715
usr/share/qgis/resources/spatialite.db
18-
usr/share/qgis/resources/qgis_help.db

doc/TRANSLATORS

Lines changed: 45 additions & 45 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)