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: ee4b663 a598552)

author	Thomas Debesse <dev@illwieckz.net>
	Mon, 11 Feb 2019 22:57:57 +0000 (23:57 +0100)
committer	Thomas Debesse <dev@illwieckz.net>
	Mon, 11 Feb 2019 23:30:29 +0000 (00:30 +0100)
commit	9bced6aaa45f3fb8a7b7f5b39deb207d1ea50924
tree	5726522c66eb09ebbe0f15e3ddd0456611a5574e	tree \| snapshot
parent	ee4b663ef7227a42b5eb051698265bed514ab3c0	commit \| diff
parent	a59855266c41b68a8bfd063713c941eff7449181	commit \| diff

Merge commit 'a59855266c41b68a8bfd063713c941eff7449181' into garux-merge

12 files changed:

libs/stringio.h	diff1 \|	diff2 \|	blob \| history
radiant/brushmanip.cpp	diff1 \|	diff2 \|	blob \| history
radiant/camwindow.cpp	diff1 \|	diff2 \|	blob \| history
radiant/entity.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.cpp	diff1 \|	diff2 \|	blob \| history
radiant/environment.h	diff1 \|	diff2 \|	blob \| history
radiant/grid.cpp	diff1 \|	diff2 \|	blob \| history
radiant/main.cpp	diff1 \|	diff2 \|	blob \| history
radiant/mainframe.cpp	diff1 \|	diff2 \|	blob \| history
radiant/patch.cpp	diff1 \|	diff2 \|	blob \| history
radiant/patch.h	diff1 \|	diff2 \|	blob \| history
radiant/patchmanip.cpp	diff1 \|	diff2 \|	blob \| history