de.git.xonotic.org Git - xonotic/netradiant.git/commit - radiant/textures.cpp

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

projects / xonotic / netradiant.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: a4f0ed0 a819228)

author	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 04:32:59 +0000 (06:32 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Tue, 21 Jun 2022 04:32:59 +0000 (06:32 +0200)
commit	27c45113f1053186ab5f7b5c0a80f052c4896a6d
tree	6a47a6154972174d75ddfa3149ce35f543814c40	tree \| snapshot
parent	a4f0ed00cccaa61ef5094dfaea610dcc62b55a6b	commit \| diff
parent	a8192282200b4691a016c4f7757638cbb132f2dc	commit \| diff

Merge commit 'a8192282200b4691a016c4f7757638cbb132f2dc' into master-merge

radiant/brush.h	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.h	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.h	diff1 \|	diff2 \|	blob \| history
radiant/map.cpp	diff1 \|	diff2 \|	blob \| history
radiant/texwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/xywindow.h	diff1 \|	diff2 \|	blob \| history