de.git.xonotic.org Git - xonotic/netradiant.git/commit - plugins/shaders/shaders.cpp

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

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e984b9f 5a8c27d)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 23:37:08 +0000 (01:37 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 25 May 2020 23:37:08 +0000 (01:37 +0200)
commit	d5e20f7336c5edf06fbc0c05cf30b8ad728128e7
tree	115469829075bbe1190d114b82f6765f852e8059	tree \| snapshot
parent	e984b9f54a0c733aab34a8ec19724dc4114ade28	commit \| diff
parent	5a8c27d93c0c57243722ade7aa3ca1f696de46f2	commit \| diff

Merge commit '5a8c27d93c0c57243722ade7aa3ca1f696de46f2' into garux-merge

13 files changed:

contrib/bobtoolz/bobToolz-GTK.cpp	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/filterbar.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/map.cpp	diff1 \|	diff2 \|	blob \| history
radiant/plugintoolbar.cpp	diff1 \|	diff2 \|	blob \| history
radiant/qe3.cpp	diff1 \|	diff2 \|	blob \| history
radiant/renderstate.cpp	diff1 \|	diff2 \|	blob \| history
radiant/select.cpp	diff1 \|	diff2 \|	blob \| history
radiant/selection.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.h	diff1 \|	diff2 \|	blob \| history