Merge branch 'master' into CrowIDE

author jpbruyere <jp.bruyere@hotmail.com>

Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)

committer jpbruyere <jp.bruyere@hotmail.com>

Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
author jpbruyere <jp.bruyere@hotmail.com>
Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
committer jpbruyere <jp.bruyere@hotmail.com>
Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
diff --cc Crow.csproj
Simple merge
diff --cc Default.style
Simple merge
diff --cc Templates/ColorPicker.template
Simple merge
diff --cc src/GraphicObjects/GraphicObject.cs
Simple merge
author	jpbruyere <jp.bruyere@hotmail.com>
	Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
committer	jpbruyere <jp.bruyere@hotmail.com>
	Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
		1	2
Crow.csproj	patch \|	diff1 \|	diff2 \|	blob \| history
Default.style	patch \|	diff1 \|	diff2 \|	blob \| history
Templates/ColorPicker.template	patch \|	diff1 \|	diff2 \|	blob \| history
src/GraphicObjects/GraphicObject.cs	patch \|	diff1 \|	diff2 \|	blob \| history