]> 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: d5701c7 d514a9b)
Merge branch 'Lyberta/NewItemNames' into 'master'
authorMirio <opivy@hotmail.de>
Mon, 16 Apr 2018 09:33:40 +0000 (09:33 +0000)
committerMirio <opivy@hotmail.de>
Mon, 16 Apr 2018 09:33:40 +0000 (09:33 +0000)
Updated entities.ent.

See merge request xonotic/xonotic-maps.pk3dir!110

1  2 
scripts/entities.ent patch | diff1 | diff2 | blob | history

diff --cc scripts/entities.ent
Simple merge