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: 833d947 dce6730)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 18:01:54 +0000 (20:01 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 18:01:54 +0000 (20:01 +0200)
commit	b25e4389ba4d089fc94cc3860774c8510b843042
tree	9472ab84558dbb52710ee54df0a52dad22cdae85	tree \| snapshot
parent	833d947959e424126907d552840203a557097e8f	commit \| diff
parent	dce6730b39a2e6484015e483c46edbe93054f6a0	commit \| diff

Merge commit 'dce6730b39a2e6484015e483c46edbe93054f6a0' into garux-merge

12 files changed:

libs/scenelib.h	diff1 \|	diff2 \|	blob \| history
plugins/entity/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/brushmanip.cpp	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/csg.cpp	diff1 \|	diff2 \|	blob \| history
radiant/filterbar.cpp	diff1 \|	diff2 \|	blob \| history
radiant/filters.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/patch.h	diff1 \|	diff2 \|	blob \| history
radiant/patchmanip.cpp	diff1 \|	diff2 \|	blob \| history
radiant/select.cpp	diff1 \|	diff2 \|	blob \| history
radiant/surfacedialog.cpp	diff1 \|	diff2 \|	blob \| history