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: b243946 6f51c7f)

author	Thomas Debesse <dev@illwieckz.net>
	Tue, 12 Feb 2019 01:56:08 +0000 (02:56 +0100)
committer	Thomas Debesse <dev@illwieckz.net>
	Tue, 12 Feb 2019 01:56:08 +0000 (02:56 +0100)
commit	c3765eb6e7f6879e5a34c48f71e5ee7bc8b8851f
tree	d9658cb25ab3bfeae1bb341072f1472c25a54dda	tree \| snapshot
parent	b243946c9ffd022cd5d82f2cf474ebfb125929b9	commit \| diff
parent	6f51c7f28dc9f56ae64e7da7d42dcbaa068da65a	commit \| diff

Merge commit '6f51c7f28dc9f56ae64e7da7d42dcbaa068da65a' into garux-merge

15 files changed:

Makefile	diff1 \|	diff2 \|	blob \| history
contrib/camera/camera.cpp	diff1 \|	diff2 \|	blob \| history
libs/gtkutil/dialog.cpp	diff1 \|	diff2 \|	blob \| history
libs/gtkutil/image.cpp	diff1 \|	diff2 \|	blob \| history
plugins/shaders/plugin.cpp	diff1 \|	diff2 \|	blob \| history
radiant/CMakeLists.txt	diff1 \|	\|	blob \| history
radiant/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.h	diff1 \|	diff2 \|	blob \| history
radiant/filterbar.cpp	\|	diff2 \|	blob \| history
radiant/filterbar.h	\|	diff2 \|	blob \| history
radiant/main.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/plugintoolbar.cpp	diff1 \|	diff2 \|	blob \| history
radiant/plugintoolbar.h	diff1 \|	diff2 \|	blob \| history