]> 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: 28d9521 fc5f1c7)
Merge branch 'master' into DefaultUser/func_train_random_target 385/head
authorMario <mario@smbclan.net>
Tue, 8 Nov 2016 03:37:22 +0000 (13:37 +1000)
committerMario <mario@smbclan.net>
Tue, 8 Nov 2016 03:37:22 +0000 (13:37 +1000)

Trivial merge