Merge branch 'master' of ssh://git.xonotic.org/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Fri, 31 Dec 2010 17:55:14 +0000 (18:55 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 31 Dec 2010 17:55:14 +0000 (18:55 +0100)
commitc4a7877baf8d1fca0145028a7d5b342d74f1725b
treebafab6b7fde7f3961f1b0e1671e471378db98ff4
parent7a04b6fdeaa81ce7f064184e91c5d3739a971e6a
parent10d0890e169fb412123d5c8565dd21b6d2ecc85e
Merge branch 'master' of ssh://git.xonotic.org/netradiant