]> 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: 10216bc ba2c014)
Merge branch 'master' into Mario/load_scrshot_entfile
authorMario <mario@smbclan.net>
Mon, 24 Sep 2018 12:48:58 +0000 (22:48 +1000)
committerMario <mario@smbclan.net>
Mon, 24 Sep 2018 12:48:58 +0000 (22:48 +1000)

Trivial merge