]> 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: 9c18b3f c5e89ce)
Merge branch 'Mario/balance_configs' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 13 Aug 2019 19:16:11 +0000 (19:16 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 13 Aug 2019 19:16:11 +0000 (19:16 +0000)
Merge branch Mario/balance_configs (S merge request)

See merge request xonotic/xonotic-data.pk3dir!680

1  2 
bal-wep-mario.cfg patch | diff1 | diff2 | blob | history

diff --cc bal-wep-mario.cfg
Simple merge