Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 18 Jan 2011 16:07:10 +0000 (17:07 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 18 Jan 2011 16:07:10 +0000 (17:07 +0100)
commit61f66a5c0fdf3d16aeca9561f4c6d60ae4cd3977
tree54a92fce4e4745e65e96d8b2a7b543f9c4cd65e1
parent36188cbdf24787bb922db9e6b0e6879f87d89021
parent8ff442735589e4276cc3ed2b1626012f2d81f13c
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir