]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into MaidenBeast/translation_updates
authorMaidenBeast <fel.sallustio@gmail.com>
Sun, 31 Jul 2011 19:01:05 +0000 (21:01 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Sun, 31 Jul 2011 19:01:05 +0000 (21:01 +0200)
commitef3002909bfd4b08ff4e2fc2f23e07849bac77e0
tree4f73ba671a82aa7aa2f23a520c82db81ad6cb71c
parente7b12effc56b759e64fff06e252d1953096a9d9f
parentd7a010137bb18ba896e4196140ffe8f4afb4de6c
Merge branch 'master' into MaidenBeast/translation_updates