]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a9d242 2b04438)
Merge branch 'master' into terencehill/itemstime_checkmark2
authorterencehill <piuntn@gmail.com>
Sun, 30 Aug 2015 16:25:59 +0000 (18:25 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 30 Aug 2015 16:25:59 +0000 (18:25 +0200)

Trivial merge