de.git.xonotic.org Git - xonotic/netradiant.git/commit

]> de.git.xonotic.org Git - xonotic/netradiant.git/commit

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 61214e7 0261afc)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 22 Feb 2021 23:19:21 +0000 (00:19 +0100)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 22 Feb 2021 23:19:21 +0000 (00:19 +0100)
commit	667d3275589dac91b5bfe96f0244183007be6efd
tree	6365b1c16d8189f62abda6a5a428d33d9b3c4ba6	tree \| snapshot
parent	61214e743288ffe8a58cf7876bd8f7f435397571	commit \| diff
parent	0261afc6df181092b7d57751fec84e21d3ac593c	commit \| diff

Merge commit '0261afc6df181092b7d57751fec84e21d3ac593c' into garux-merge

12 files changed:

plugins/mapq3/write.cpp	diff1 \|	diff2 \|	blob \| history
radiant/brush.h	diff1 \|	diff2 \|	blob \| history
radiant/entityinspector.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/map.cpp	diff1 \|	diff2 \|	blob \| history
radiant/patch.h	diff1 \|	diff2 \|	blob \| history
radiant/select.cpp	diff1 \|	diff2 \|	blob \| history
radiant/selection.cpp	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/light.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/light_ydnar.c	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/q3map2.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/shaders.c	diff1 \|	diff2 \|	blob \| history