Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 20:48:32 +0000 (22:48 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 20:48:32 +0000 (22:48 +0200)
commit8f10e29d659231bc3ec3896fde9b1322c905ffa7
tree19f109c42e0893afb58ee710e6a07d0247599c99
parentc53177ca964eea2500cb954e322af5146cc2078c
parent2498e2b602d10302ab352014ba763daf8891f762
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
all