Revert "Update branch name: master -> development"
This reverts commit 6cf9d04de5
.
This commit is contained in:
parent
60fd504caf
commit
68db6956d2
4 changed files with 7 additions and 7 deletions
12
.travis.yml
12
.travis.yml
|
@ -12,22 +12,22 @@ cache:
|
|||
matrix:
|
||||
include:
|
||||
- compiler: gcc
|
||||
env: CXXSTD=14 NLS=true LTS=1604 BRANCH=development
|
||||
env: CXXSTD=14 NLS=true LTS=1604 BRANCH=master
|
||||
|
||||
- compiler: gcc
|
||||
env: TOOL=scons CXXSTD=17 NLS=false LTS=1804 BRANCH=development
|
||||
env: TOOL=scons CXXSTD=17 NLS=false LTS=1804 BRANCH=master
|
||||
|
||||
- compiler: gcc
|
||||
env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=development OPT=-O0
|
||||
env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master OPT=-O0
|
||||
|
||||
- compiler: gcc
|
||||
env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=development
|
||||
env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=master
|
||||
|
||||
- compiler: clang
|
||||
env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=development OPT=-O0
|
||||
env: TOOL=scons CXXSTD=14 NLS=false LTS=1604 BRANCH=master OPT=-O0
|
||||
|
||||
- compiler: clang
|
||||
env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=development
|
||||
env: TOOL=cmake CXXSTD=14 NLS=false LTS=1604 BRANCH=master
|
||||
|
||||
- os: osx
|
||||
compiler: clang
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
[](https://travis-ci.org/wesnoth/wesnoth)
|
||||
[](https://travis-ci.org/wesnoth/wesnoth)
|
||||
[](https://ci.appveyor.com/project/wesnoth/wesnoth)
|
||||
[](https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html)
|
||||
[](https://scan.coverity.com/projects/wesnoth)
|
||||
|
|
Loading…
Add table
Reference in a new issue