]> 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: 9c416e3 e6eb6e7)
Merge branch 'master' into terencehill/eventchase
authorterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:45:56 +0000 (23:45 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 14 Dec 2014 22:45:56 +0000 (23:45 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge