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: 2f3b74e c3765eb)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:44:49 +0000 (04:44 +0200)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 20 Jun 2022 02:44:49 +0000 (04:44 +0200)
commit	bff6a16b47f8db761c57ce4c17d35916a4da6f1e
tree	6702d7d60d0660f3d3fa616b7fb167a8c3c391f4	tree \| snapshot
parent	2f3b74eff8ba0ca83d3f7d14fe11f93483d22c89	commit \| diff
parent	c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f	commit \| diff

Merge commit 'c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f' into master-merge

Makefile	diff1 \|	diff2 \|	blob \| history
contrib/camera/camera.cpp	diff1 \|	diff2 \|	blob \| history
radiant/CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
radiant/environment.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.h	diff1 \|	diff2 \|	blob \| history
radiant/main.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/plugintoolbar.cpp	diff1 \|	diff2 \|	blob \| history