Merge remote-tracking branch 'tmp/hollowpyramid'

author sfan5 <sfan5@live.de>

Thu, 13 Oct 2016 15:51:01 +0000 (17:51 +0200)

committer sfan5 <sfan5@live.de>

Thu, 13 Oct 2016 15:51:01 +0000 (17:51 +0200)
author sfan5 <sfan5@live.de>
Thu, 13 Oct 2016 15:51:01 +0000 (17:51 +0200)
committer sfan5 <sfan5@live.de>
Thu, 13 Oct 2016 15:51:01 +0000 (17:51 +0200)
diff --cc ChatCommands.md
Simple merge
diff --cc WorldEdit API.md
Simple merge
diff --cc worldedit/primitives.lua
Simple merge
diff --cc worldedit_commands/init.lua
Simple merge
diff --cc worldedit_gui/functionality.lua
Simple merge
author	sfan5 <sfan5@live.de>
	Thu, 13 Oct 2016 15:51:01 +0000 (17:51 +0200)
committer	sfan5 <sfan5@live.de>
	Thu, 13 Oct 2016 15:51:01 +0000 (17:51 +0200)
		1	2
ChatCommands.md	patch \|	diff1 \|	diff2 \|	blob \| history
WorldEdit API.md	patch \|	diff1 \|	diff2 \|	blob \| history
worldedit/primitives.lua	patch \|	diff1 \|	diff2 \|	blob \| history
worldedit_commands/init.lua	patch \|	diff1 \|	diff2 \|	blob \| history
worldedit_gui/functionality.lua	patch \|	diff1 \|	diff2 \|	blob \| history