Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant
authorRudolf Polzer <divverent@alientrap.org>
Tue, 22 Feb 2011 19:09:54 +0000 (20:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 22 Feb 2011 19:09:54 +0000 (20:09 +0100)
commit2f2fcf474924a49952713a4b2b39903d36e5f2ce
tree0444d0dca6f815930eccb32bab1c52ec28a4f3be
parentde28d9de1d75fd0a8ce419d695962c502aa6a3e3
parent6b48a837f99ba86e55f811f9c68384660c45da94
Merge branch 'master' of git://git.xonotic.org/xonotic/netradiant