]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/TimePath/experiments/csqc_prediction' into TimeP...
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 09:02:30 +0000 (20:02 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 2 Feb 2015 09:02:30 +0000 (20:02 +1100)
1  2 
qcsrc/common/physics.qc

Simple merge