]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1b0511 d9847bd)
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 patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge