]> 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: bac64fa 9a906a5)
Merge branch 'master' into mirio/balance
authorMirio <opivy@hotmail.de>
Wed, 2 Mar 2016 19:58:47 +0000 (20:58 +0100)
committerMirio <opivy@hotmail.de>
Wed, 2 Mar 2016 19:58:47 +0000 (20:58 +0100)
1  2 
bal-wep-xonotic.cfg patch | diff1 | diff2 | blob | history
bal-wep-xpm.cfg patch | diff1 | diff2 | blob | history

diff --cc bal-wep-xonotic.cfg
Simple merge
diff --cc bal-wep-xpm.cfg
Simple merge