diff options
| author | Didier Raboud <odyx@debian.org> | 2012-12-20 07:58:57 +0100 |
|---|---|---|
| committer | Didier Raboud <odyx@debian.org> | 2012-12-20 07:58:57 +0100 |
| commit | 2d50ff1c39aa7f26d0dccc0b9132af9573218921 (patch) | |
| tree | 3655d129af8a8ea474602f41b74023258f997ba9 /.travis.yml | |
| parent | 273a97fbc2cb81bfcd468e2bdb6b0600b0d739cf (diff) | |
| parent | f77734e01c85aded92cf5fdc1e7038658e6aaf29 (diff) | |
| download | colobot-2d50ff1c39aa7f26d0dccc0b9132af9573218921.tar.gz colobot-2d50ff1c39aa7f26d0dccc0b9132af9573218921.tar.bz2 colobot-2d50ff1c39aa7f26d0dccc0b9132af9573218921.zip | |
Merge branch 'dev' into debian
Conflicts:
.travis.yml
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index c65683d..ed7cf35 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,4 +8,3 @@ before_install: - sudo apt-get install -qq --no-install-recommends devscripts dpkg-dev lintian equivs - mk-build-deps --root-cmd sudo --tool "apt-get -qq --no-install-recommends" --install --remove - dch -v 0~git$(date +%Y%m%d%H%M)00-1~travis0 -m "Automated test-build." - - mkdir -p ../data |