]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90510a8 86ad97a)
Merge branch 'master' into Cloudwalk/32bitprogs
authorCloudwalk <cloudwalk009@gmail.com>
Tue, 21 Jul 2020 19:12:48 +0000 (15:12 -0400)
committerCloudwalk <cloudwalk009@gmail.com>
Tue, 21 Jul 2020 19:12:48 +0000 (15:12 -0400)
1  2 
prvm_edict.c patch | diff1 | diff2 | blob | history

diff --cc prvm_edict.c
Simple merge