]> O.S.I.I.S - jp/crow.git/commitdiff
Merge branch 'master' into CrowIDE
authorjpbruyere <jp.bruyere@hotmail.com>
Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
committerjpbruyere <jp.bruyere@hotmail.com>
Tue, 24 Jan 2017 11:46:43 +0000 (12:46 +0100)
1  2 
Crow.csproj
Default.style
Templates/ColorPicker.template
src/GraphicObjects/GraphicObject.cs

diff --cc Crow.csproj
Simple merge
diff --cc Default.style
Simple merge
Simple merge
Simple merge