]> 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: 18d6521 cfea8f8)
Merge remote branch 'refs/remotes/origin/fruitiex/xpmbalance'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 17:56:57 +0000 (19:56 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 15 May 2010 17:56:57 +0000 (19:56 +0200)
1  2 
balanceXPM.cfg patch | diff1 | diff2 | blob | history

diff --cc balanceXPM.cfg
Simple merge