]> 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: b137896 3a8534f)
Merge branch 'martin-t/electro-denoobing' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 18 Jan 2020 14:36:36 +0000 (14:36 +0000)
Electro: midair combos

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

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

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