]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/race_target_waypoint
authorMario <mario@smbclan.net>
Sun, 12 Mar 2017 03:21:26 +0000 (13:21 +1000)
committerMario <mario@smbclan.net>
Sun, 12 Mar 2017 03:21:26 +0000 (13:21 +1000)
1  2 
qcsrc/server/race.qc

Simple merge