]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:22:21 +0000 (09:22 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 9 Jun 2013 07:22:21 +0000 (09:22 +0200)
commit8f30917db125403c9555832769bc2fc728444670
tree7f2fc2d8148352677ce61cdb122739839f682723
parent2092d81fc881ad10a2811a32c82abf5595f92f48
parentcfaacd5aff51c88ae76519d019aa6427ba1c5bc0
Merge branch 'master' into matthiaskrgr/gitignore