Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 26 Mar 2010 07:59:18 +0000 (08:59 +0100)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 26 Mar 2010 07:59:18 +0000 (08:59 +0100)
commitc2ed283428ee4e6c12272b23d5a5e26c35e0d13c
treeb867a16a5398e559b20328ee946f1f475812156c
parent09956394ea59fd374e8eef617876e76684552787
parente4739f5dfbc1e7fd9b945c6e86083eed5fec7667
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
all