]> 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: e9b8b02 d956593)
Merge branch 'master' into terencehill/ca_ft_fixes
authorterencehill <piuntn@gmail.com>
Tue, 18 Jun 2013 15:33:00 +0000 (17:33 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Jun 2013 15:33:00 +0000 (17:33 +0200)
1  2 
gamemodes.cfg patch | diff1 | diff2 | blob | history

diff --cc gamemodes.cfg
Simple merge