]> git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d52e81c 3bb23ba)
Merge branch 'Mirio/universaltrigger'
authorMirio <opivy@hotmail.de>
Thu, 27 Aug 2015 16:06:44 +0000 (18:06 +0200)
committerMirio <opivy@hotmail.de>
Thu, 27 Aug 2015 16:06:44 +0000 (18:06 +0200)

Trivial merge