]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitcb50e93740ef271e9eaa3535ef8aa733dcbfa027
treee41b6411881c94dae4ee6fe327d25f39d6f3fa63
parenta7d312116c36dae2334879b44bf7e2cb483ecb0b
parent07696127a45ddb28c0dd347244021459e355423e
Merge branch 'Mario/combined_prediction' into Mario/combined_updates