]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sun, 10 Apr 2011 15:57:56 +0000 (17:57 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 10 Apr 2011 15:57:56 +0000 (17:57 +0200)
commit00f45c5adc0efe49e799a3aef81d1d6fe540a90d
treee64f5a94d57a2becc279bab3cff84d01d0108e01
parenteba2a138562451944af5fb43a66d976941424cda
parent8d640f864cdbdefc91f91897447abfd2639f9efe
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir