]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b8dd77 eda70ff)
Merge branch 'master' into matthiaskrgr/lightspeed
authorMatthias Krüger <matthias.krueger@famsik.de>
Sat, 13 Jul 2013 09:17:46 +0000 (11:17 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Sat, 13 Jul 2013 09:17:46 +0000 (11:17 +0200)
Conflicts:
maps/lightspeed.map.options

1  2 
maps/lightspeed.map.options patch | diff1 | diff2 | blob | history

diff --cc maps/lightspeed.map.options
Simple merge