]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balance
authorSamual <samual@xonotic.org>
Wed, 26 Oct 2011 03:10:21 +0000 (23:10 -0400)
committerSamual <samual@xonotic.org>
Wed, 26 Oct 2011 03:10:21 +0000 (23:10 -0400)
commit008ad760c67f5401849e95dadea1fb87096907e1
tree3988af52c75bade4baefbdb96e74d71961502cd9
parente076f2d148953a5d1ba6000d8e15494f4ad04c7e
parent2c686bbd1fd1ac6839152d0993e6454b7c683c13
Merge remote branch 'origin/master' into samual/balance
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc