]> 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: 08e6497 b822740)
Merge branch 'master' into terencehill/slider_anim_improvements
authorterencehill <piuntn@gmail.com>
Wed, 2 Sep 2015 17:26:30 +0000 (19:26 +0200)
committerterencehill <piuntn@gmail.com>
Wed, 2 Sep 2015 17:26:30 +0000 (19:26 +0200)

Trivial merge