Skip to content

Commit d401a6e

Browse files
volayavolaya
committedDec 11, 2012
Merge branch 'master' of https://github.com/qgis/Quantum-GIS
Conflicts: python/plugins/sextante/grass/GrassAlgorithm.py
·
ltr-3_40Before-merge-new_vector_api
2 parents a4186df + c84408e commit d401a6e

File tree

184 files changed

+2062
-1789
lines changed

Some content is hidden

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

184 files changed

+2062
-1789
lines changed
 

‎mac/xcode/src/x_qgsspatialitesourceselect.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* This file is free software: you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation, either version 3 of the License, or
5+
* (at your option) any later version.
6+
*/
17
#if !SQLITE_QSYSTEM
28

39
#include "../../src/app/qgsspatialitesourceselect.cpp"

‎mac/xcode/src/x_spatialite.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
/*
2+
* This file is free software: you can redistribute it and/or modify
3+
* it under the terms of the GNU General Public License as published by
4+
* the Free Software Foundation, either version 3 of the License, or
5+
* (at your option) any later version.
6+
*/
17
#if SQLITE_QINTERNAL
28

39
#include "../../src/core/spatialite/spatialite.c"

0 commit comments

Comments
 (0)