]> 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: 3ef447b c13cdc9)
Merge branch 'master' into terencehill/cursormode
authorterencehill <piuntn@gmail.com>
Wed, 14 Mar 2012 21:10:32 +0000 (22:10 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 14 Mar 2012 21:10:32 +0000 (22:10 +0100)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud_config.qc 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/hud.qc
Simple merge
diff --cc qcsrc/client/hud_config.qc
Simple merge