]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 18:46:18 +0000 (20:46 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 18:46:18 +0000 (20:46 +0200)
commit0a610e05f536da8197c4f751eada28d6b4e99738
tree9b6da45625c170102780d02d954565e87bd1a859
parent9787fbbdb7281865ececba03b715f3d3ea422482
parentff24ac3181392c99513a15c4d2a79bfdd52ecf36
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
defaultXonotic.cfg