]> 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: ad4d738 4158041)
Merge branch 'terencehill/powerup_randomness_2'
authorterencehill <piuntn@gmail.com>
Fri, 30 Mar 2018 23:00:25 +0000 (01:00 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 30 Mar 2018 23:00:25 +0000 (01:00 +0200)

Trivial merge