]> 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: cda58c4 a2c2032)
Merge remote-tracking branch 'origin/master' into Melanosuchus/single_player
authorMattia Basaglia <mattia.basaglia@gmail.com>
Sun, 19 Mar 2017 09:03:24 +0000 (09:03 +0000)
committerMattia Basaglia <mattia.basaglia@gmail.com>
Sun, 19 Mar 2017 09:03:24 +0000 (09:03 +0000)

Trivial merge