Merge remote-tracking branch 'origin/terencehill/reload_binds', closes #1360
authorRudolf Polzer <divverent@xonotic.org>
Tue, 29 Jan 2013 19:30:22 +0000 (20:30 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 29 Jan 2013 19:30:35 +0000 (20:30 +0100)
1  2 
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh

Simple merge
Simple merge
Simple merge