Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <rpolzer@nb-04.(none)>
Mon, 29 Mar 2010 06:41:31 +0000 (08:41 +0200)
committerRudolf Polzer <rpolzer@nb-04.(none)>
Mon, 29 Mar 2010 06:41:31 +0000 (08:41 +0200)
commitfe9e135a69b6daa403f88421e9e13cfbd5ee4ff5
tree06d181b105eb444178135eb66edf1ad5a7b5e987
parent879cbba9e2e2890d78cbbf3fac23501376db7cac
parenta870e86f2e720d051d480a8dd81bd502b04d0c41
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all