]> 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: 2c48bae 00c0fca)
Merge remote branch 'origin/master' into samual/balance_testing
authorSamual <samual@xonotic.org>
Sun, 19 Feb 2012 22:56:08 +0000 (17:56 -0500)
committerSamual <samual@xonotic.org>
Sun, 19 Feb 2012 22:56:08 +0000 (17:56 -0500)
1  2 
balanceXPM.cfg patch | diff1 | diff2 | blob | history
balanceXonotic.cfg patch | diff1 | diff2 | blob | history

diff --cc balanceXPM.cfg
Simple merge
diff --cc balanceXonotic.cfg
Simple merge