diff options
| author | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
|---|---|---|
| committer | Teetime <TeetimeTW@yahoo.de> | 2012-02-17 19:31:43 +0100 |
| commit | fc99167e687ba688ce9306bbec7e801450c917be (patch) | |
| tree | b440f2568a98b4b6a8db17925a299142adead7fa /scripts/build.py | |
| parent | 206e9adb9140c3c8963661f534703de33f8abe05 (diff) | |
| parent | 44a47d4253a829abcf50dac5586fd9a351f0c66b (diff) | |
| download | zcatch-fc99167e687ba688ce9306bbec7e801450c917be.tar.gz zcatch-fc99167e687ba688ce9306bbec7e801450c917be.zip | |
Merge branch 'master' into zCatch-Exp
Conflicts: src/engine/server.h src/engine/server/server.cpp src/engine/server/server.h src/engine/shared/network.h src/engine/shared/network_server.cpp src/game/server/player.h
Diffstat (limited to 'scripts/build.py')
| -rw-r--r-- | scripts/build.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/build.py b/scripts/build.py index 17911d84..ca23ae8b 100644 --- a/scripts/build.py +++ b/scripts/build.py @@ -12,7 +12,7 @@ if match != None: os.chdir('../') url_bam = "http://github.com/matricks/bam/zipball/master" -url_teeworlds = "http://github.com/oy/teeworlds/zipball/master" +url_teeworlds = "http://github.com/teeworlds/teeworlds/zipball/master" release_type = "server_release client_release" arguments = OptionParser() |