]> de.git.xonotic.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: fa42f89 d3a9647)
Merge branch 'master' into maddin/shader-weapclip
authorMirio <opivy@hotmail.de>
Thu, 30 Mar 2017 17:50:27 +0000 (19:50 +0200)
committerMirio <opivy@hotmail.de>
Thu, 30 Mar 2017 17:50:27 +0000 (19:50 +0200)

Trivial merge