]> de.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: f73cc43 d99e109)
Merge branch 'master' into Mario/qc_physics_cleanup_v2 341/head
authorMario <mario@smbclan.net>
Sat, 23 Jul 2016 16:59:32 +0000 (02:59 +1000)
committerMario <mario@smbclan.net>
Sat, 23 Jul 2016 16:59:32 +0000 (02:59 +1000)

Trivial merge