]> 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: bc495ae 8a4ebca)
Merge branch 'master' into tzork/map-dotc_test4
authorMario <mario@smbclan.net>
Mon, 27 Feb 2017 12:21:10 +0000 (22:21 +1000)
committerMario <mario@smbclan.net>
Mon, 27 Feb 2017 12:21:10 +0000 (22:21 +1000)
1  2 
scripts/entities.ent patch | diff1 | diff2 | blob | history

diff --cc scripts/entities.ent
Simple merge