]> 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: 81469f5 0aa7cb8)
Merge branch 'master' into martin-t/effects
authorMartin Taibr <taibr.martin@gmail.com>
Sat, 20 Oct 2018 14:29:33 +0000 (16:29 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sat, 20 Oct 2018 14:29:33 +0000 (16:29 +0200)
1  2 
_hud_common.cfg patch | diff1 | diff2 | blob | history
xonotic-client.cfg patch | diff1 | diff2 | blob | history

diff --cc _hud_common.cfg
Simple merge
diff --cc xonotic-client.cfg
Simple merge