Skip to content

Commit dc078b8

Browse files
ahuarte47ahuarte47
committedNov 14, 2013
Merge remote-tracking branch 'upstream/master' into Issue_8725-OGR
·
ltr-3_40archive/master_2
2 parents c26fecf + af73f30 commit dc078b8

File tree

79 files changed

+4777
-2775
lines changed

Some content is hidden

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

79 files changed

+4777
-2775
lines changed
 

‎cmake_templates/qgsconfig.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
//used by Mac to find system Qt plugins when bundle is run from build directory
3333
#define QTPLUGINSDIR "${QT_PLUGINS_DIR}"
3434

35+
//used by Mac to find system Open Scene Graph plugins when bundle is run from build directory
36+
#define OSG_PLUGINS_PATH "${OSG_PLUGINS_PATH}"
37+
3538
#cmakedefine USING_NMAKE
3639

3740
#cmakedefine HAVE_POSTGRESQL

‎doc/TRANSLATORS

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

0 commit comments

Comments
 (0)
Please sign in to comment.