Skip to content

Commit 9d3079b

Browse files
NathanW2NathanW2
committedOct 17, 2011
Merge remote-tracking branch 'upstream/master' into expression-labels
Conflicts: src/core/qgsexpression.cpp src/gui/CMakeLists.txt
·
ltr-3_40Before-merge-new_vector_api
2 parents fc80b60 + 139e297 commit 9d3079b

File tree

335 files changed

+38188
-24411
lines changed

Some content is hidden

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

335 files changed

+38188
-24411
lines changed
 

‎BUGS

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Help I think I found a bug!
33

44
If you find a bug in QGIS, you can report it using the QGIS ticket/bug database at:
55

6-
http://trac.osgeo.org/qgis/report
6+
http://hub.qgis.org/projects/quantum-gis/issues/new
77

88

99
Some hints about when you should file a bug:
@@ -25,6 +25,3 @@ Some hints about when you should file a bug:
2525
do. While we appreciate it's inconvenient if some issue prevents you doing
2626
your work, we need to take the big picture view of things and focus on
2727
things that affect the largest proportion of our user base.
28-
29-
30-
$Id$

‎CHANGELOG

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

0 commit comments

Comments
 (0)
Please sign in to comment.