Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:qgis/QGIS
- Loading branch information
Showing
550 changed files
with
12,520 additions
and
2,901 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1 +1,16 @@ | |||
| ########################################################################### | |||
| # after_script.sh | |||
| # --------------------- | |||
| # Date : September 2015 | |||
| # Copyright : (C) 2015 by Matthias Kuhn | |||
| # Email : matthias at opengis dot ch | |||
| ########################################################################### | |||
| # # | |||
| # This program is free software; you can redistribute it and/or modify # | |||
| # it under the terms of the GNU General Public License as published by # | |||
| # the Free Software Foundation; either version 2 of the License, or # | |||
| # (at your option) any later version. # | |||
| # # | |||
| ########################################################################### | |||
|
|
|||
| [ -r /tmp/ctest-important.log ] && cat /tmp/ctest-important.log | [ -r /tmp/ctest-important.log ] && cat /tmp/ctest-important.log | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,4 +1,19 @@ | |||
| #!/bin/bash | #!/bin/bash | ||
| ########################################################################### | |||
| # before_install.sh | |||
| # --------------------- | |||
| # Date : August 2015 | |||
| # Copyright : (C) 2015 by Nyall Dawson | |||
| # Email : nyall dot dawson at gmail dot com | |||
| ########################################################################### | |||
| # # | |||
| # This program is free software; you can redistribute it and/or modify # | |||
| # it under the terms of the GNU General Public License as published by # | |||
| # the Free Software Foundation; either version 2 of the License, or # | |||
| # (at your option) any later version. # | |||
| # # | |||
| ########################################################################### | |||
|
|
|||
|
|
|
||
| DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| ${DIR}/qt${QT_VERSION}/before_install.sh | ${DIR}/qt${QT_VERSION}/before_install.sh | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Original file line | Diff line number | Diff line change |
|---|---|---|---|
| @@ -1,4 +1,19 @@ | |||
| #!/bin/bash | #!/bin/bash | ||
| ########################################################################### | |||
| # install.sh | |||
| # --------------------- | |||
| # Date : August 2015 | |||
| # Copyright : (C) 2015 by Nyall Dawson | |||
| # Email : nyall dot dawson at gmail dot com | |||
| ########################################################################### | |||
| # # | |||
| # This program is free software; you can redistribute it and/or modify # | |||
| # it under the terms of the GNU General Public License as published by # | |||
| # the Free Software Foundation; either version 2 of the License, or # | |||
| # (at your option) any later version. # | |||
| # # | |||
| ########################################################################### | |||
|
|
|||
|
|
|
||
| DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| ${DIR}/qt${QT_VERSION}/install.sh | ${DIR}/qt${QT_VERSION}/install.sh | ||
Oops, something went wrong.