]> 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: 7b77286 cc8895c)
Merge remote-tracking branch 'origin/terencehill/mutators_dialog_cleanup'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 20:06:20 +0000 (22:06 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 20:06:20 +0000 (22:06 +0200)

Trivial merge