git.rm.cloudns.org Git - xonotic/netradiant.git/commit

]> git.rm.cloudns.org Git - xonotic/netradiant.git/commit

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: fcb70e8 839c969)

author	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 02:25:25 +0000 (04:25 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 02:25:25 +0000 (04:25 +0200)
commit	5f72a1053d72cdbfe38d97e5b1fd9688316ceb40
tree	24ca4addf792c8521dd460d3105bcbb51e4c8779	tree \| snapshot
parent	fcb70e8e9cf76dd4993312a762e2ee255c1402a0	commit \| diff
parent	839c9693774fdb0e420391f65b8066e8bd04c591	commit \| diff

Merge commit '839c9693774fdb0e420391f65b8066e8bd04c591' into master-merge

14 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
libs/string/string.h	diff1 \|	diff2 \|	blob \| history
radiant/build.cpp	diff1 \|	diff2 \|	blob \| history
radiant/csg.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.h	diff1 \|	diff2 \|	blob \| history
radiant/main.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/map.cpp	diff1 \|	diff2 \|	blob \| history
radiant/server.cpp	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/brush.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/bspfile_abstract.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/main.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/q3map2.h	diff1 \|	diff2 \|	blob \| history