]> 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: 3034dc9 c6b530e)
Merge branch 'Mario/grenade_prediction_fix'
authorMario <mario@smbclan.net>
Mon, 27 Jun 2016 01:56:30 +0000 (11:56 +1000)
committerMario <mario@smbclan.net>
Mon, 27 Jun 2016 01:56:30 +0000 (11:56 +1000)

Trivial merge