]> 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: ffa0504 87bcf91)
Merge branch 'master' into terencehill/cursormode
authorterencehill <piuntn@gmail.com>
Wed, 9 Nov 2011 23:35:06 +0000 (00:35 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 9 Nov 2011 23:35:06 +0000 (00:35 +0100)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

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