summaryrefslogtreecommitdiffstats
path: root/pacman-c++
diff options
context:
space:
mode:
authortotycro <totycro@unknown-horizons.org>2011-04-11 12:38:08 +0200
committertotycro <totycro@unknown-horizons.org>2011-04-11 12:38:08 +0200
commitc88b773a4e95eb903e47cdbe8063bd25e2a70fda (patch)
tree759dc074fac9672388a0fda9cf086ebc58ddd09a /pacman-c++
parent51a3559e5df31018d7de14357f83c24e7e508d7e (diff)
parent8cedc69ce2809abf69326ce81e0ccb4ac6efff6a (diff)
downloadfoop-c88b773a4e95eb903e47cdbe8063bd25e2a70fda.tar.gz
foop-c88b773a4e95eb903e47cdbe8063bd25e2a70fda.tar.bz2
foop-c88b773a4e95eb903e47cdbe8063bd25e2a70fda.zip
Merge branch 'master' of git.manuel.mausz.at:/foop
Diffstat (limited to 'pacman-c++')
-rwxr-xr-xpacman-c++/rebuild-client.sh2
-rwxr-xr-xpacman-c++/rebuild-server.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/pacman-c++/rebuild-client.sh b/pacman-c++/rebuild-client.sh
index f317d6d..17cf206 100755
--- a/pacman-c++/rebuild-client.sh
+++ b/pacman-c++/rebuild-client.sh
@@ -1,4 +1,4 @@
1#!/bin/sh 1#!/bin/sh
2#make distclean 2#make distclean
3qmake CONFIG+=DEBUG pacman.pro 3qmake CONFIG+=DEBUG pacman.pro
4make -j2 4make -j2
diff --git a/pacman-c++/rebuild-server.sh b/pacman-c++/rebuild-server.sh
index f00d67b..8d2adb9 100755
--- a/pacman-c++/rebuild-server.sh
+++ b/pacman-c++/rebuild-server.sh
@@ -1,4 +1,4 @@
1#!/bin/sh 1#!/bin/sh
2#make distclean 2#make distclean
3qmake CONFIG+=DEBUG pacman.server.pro 3qmake CONFIG+=DEBUG pacman.server.pro -o Makefile.server
4make -j2 4make -f Makefile.server -j2