diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-01-22 02:20:43 +0300 |
commit | e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914 (patch) | |
tree | 4e9f65c3ef67e6e06e1e1dca140e2d7ef6a22ff7 /nightly/buildlinux.sh | |
parent | b6eb53b9abdf48b88cb1978b9af97f2a879d2717 (diff) | |
parent | acc25a7dffefb8b8b4e8022af918794d26048453 (diff) | |
download | plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.gz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.bz2 plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.tar.xz plus-e71376322cbe85d59ca7d1a9d7f2a3db9ae9b914.zip |
Merge commit 'v1.2.1.22' into stripped
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
src/CMakeLists.txt
src/Makefile.am
src/guichan/gui.cpp
Diffstat (limited to 'nightly/buildlinux.sh')
-rwxr-xr-x | nightly/buildlinux.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nightly/buildlinux.sh b/nightly/buildlinux.sh index 4fcc828f2..b6f3efc77 100755 --- a/nightly/buildlinux.sh +++ b/nightly/buildlinux.sh @@ -28,4 +28,5 @@ then mkdir -p $DSTDIR/bin cp src/manaplus $DSTDIR/bin cp nightly/runme.sh $DSTDIR + cp "nightly/run tests.sh" $DSTDIR fi |