Merge branch 'master' into TimePath/combined_updates
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 14 Dec 2014 01:09:46 +0000 (12:09 +1100)
commita94cd06c4cc5cb8c51ccb40ef77f93b4b6131207
treeffda0d915bc1834ec7a1d03227cc21281863ccf9
parent395b77e37afd4209b88019d1599534619dc5a621
parent35cf636a20e766a68fca2957de8891e7cf6745bb
Merge branch 'master' into TimePath/combined_updates
qcsrc/server/cl_player.qc