]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cab2f1c f7f934a)
Merge branch 'master' into matthiaskrgr/all_map_pk3
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 13 Jul 2013 09:28:58 +0000 (11:28 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 13 Jul 2013 09:28:58 +0000 (11:28 +0200)

Trivial merge