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: e744bb6 6e687ef)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 11 Feb 2019 07:23:51 +0000 (08:23 +0100)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 11 Feb 2019 07:23:51 +0000 (08:23 +0100)
commit	a78b39f38a98bef33e988ff35d37d15c7e2819a8
tree	11d9ac6b370868f906df57cab8bd8621d7f23a3f	tree \| snapshot
parent	e744bb6dadcd57fff460b7e6409ecd61bfe272c7	commit \| diff
parent	6e687efe8899278a955efd1e3ba4de5300f7949a	commit \| diff

Merge commit '6e687efe8899278a955efd1e3ba4de5300f7949a' into garux-merge

13 files changed:

plugins/entity/light.cpp	diff1 \|	diff2 \|	blob \| history
plugins/shaders/shaders.cpp	diff1 \|	diff2 \|	blob \| history
radiant/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/gtkdlgs.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mru.cpp	diff1 \|	diff2 \|	blob \| history
radiant/patchmanip.cpp	diff1 \|	diff2 \|	blob \| history
radiant/preferences.cpp	diff1 \|	diff2 \|	blob \| history
radiant/surfacedialog.cpp	diff1 \|	diff2 \|	blob \| history
radiant/watchbsp.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.h	diff1 \|	diff2 \|	blob \| history
tools/quake3/q3map2/map.c	diff1 \|	diff2 \|	blob \| history