]> 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: 4f8ca9c 3034dc9)
Merge branch 'master' into matthiaskrgr/screenshotcmd
authorMatthias Krüger <matthias.krueger@famsik.de>
Mon, 27 Jun 2016 01:31:48 +0000 (03:31 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Mon, 27 Jun 2016 01:31:48 +0000 (03:31 +0200)
1  2 
commands.cfg patch | diff1 | diff2 | blob | history

diff --cc commands.cfg
Simple merge