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
qcsrc/client/View.qc

Simple merge
Simple merge