]> 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: a7d3121 0769612)
Merge branch 'Mario/combined_prediction' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Tue, 24 Mar 2015 08:43:29 +0000 (19:43 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 24 Mar 2015 08:43:29 +0000 (19:43 +1100)

Trivial merge