diff options
| author | totycro <totycro@unknown-horizons.org> | 2011-04-11 12:38:08 +0200 |
|---|---|---|
| committer | totycro <totycro@unknown-horizons.org> | 2011-04-11 12:38:08 +0200 |
| commit | c88b773a4e95eb903e47cdbe8063bd25e2a70fda (patch) | |
| tree | 759dc074fac9672388a0fda9cf086ebc58ddd09a | |
| parent | 51a3559e5df31018d7de14357f83c24e7e508d7e (diff) | |
| parent | 8cedc69ce2809abf69326ce81e0ccb4ac6efff6a (diff) | |
| download | foop-c88b773a4e95eb903e47cdbe8063bd25e2a70fda.tar.gz foop-c88b773a4e95eb903e47cdbe8063bd25e2a70fda.tar.bz2 foop-c88b773a4e95eb903e47cdbe8063bd25e2a70fda.zip | |
Merge branch 'master' of git.manuel.mausz.at:/foop
| -rwxr-xr-x | pacman-c++/rebuild-client.sh | 2 | ||||
| -rwxr-xr-x | pacman-c++/rebuild-server.sh | 4 |
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 |
| 3 | qmake CONFIG+=DEBUG pacman.pro | 3 | qmake CONFIG+=DEBUG pacman.pro |
| 4 | make -j2 | 4 | make -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 |
| 3 | qmake CONFIG+=DEBUG pacman.server.pro | 3 | qmake CONFIG+=DEBUG pacman.server.pro -o Makefile.server |
| 4 | make -j2 | 4 | make -f Makefile.server -j2 |