]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into matthiaskrgr/gitignore
authorMatthias Krüger <matthias.krueger@famsik.de>
Sun, 16 Jun 2013 16:27:22 +0000 (18:27 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sun, 16 Jun 2013 16:27:22 +0000 (18:27 +0200)
commitd956593da422ba1a23a26df20f87fe827593938c
treed13c78d79b08f7e42e0d40780073931fca5d0ef6
parentc58773440e625c00b8bd30e5d43337914f7b922b
parent76bb77f7f186502238608a90a6ef7b66fb72574e
Merge branch 'master' into matthiaskrgr/gitignore