]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 50967b6 4815098)
Merge branch 'master' into terencehill/mutators_dialog_cleanup
authorterencehill <piuntn@gmail.com>
Thu, 10 May 2012 16:11:09 +0000 (18:11 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 10 May 2012 16:11:09 +0000 (18:11 +0200)

Trivial merge