Merge branch 'master' into toutatis

This commit is contained in:
Rubén Rodríguez 2013-05-15 20:36:49 +02:00
commit d23429e70c

View file

@ -23,7 +23,7 @@
if [ $(git status -s | wc -l) != 0 ] if [ $(git status -s | wc -l) != 0 ]
then then
echo You have uncommited git changes, stopping echo You have uncommited git changes, stopping
exit 1 [ 1$1 = 1"test" ] || exit 1
fi fi
PAIRS="robur-hardy taranis-lucid dagda-natty brigantia-oneiric toutatis-precise" PAIRS="robur-hardy taranis-lucid dagda-natty brigantia-oneiric toutatis-precise"