]> 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: 8ba1f6c 19eeff9)
Merge branch 'master' into Mirio/balance
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 00:54:39 +0000 (10:54 +1000)
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