Lars Brubaker 9ed4972915 Merge branch '1.2.3' into development ... Conflicts: Submodules/MatterSlice Submodules/agg-sharp		2015-06-09 11:40:52 -07:00
..
agg-sharp@2954046c77	Merge branch '1.2.3' into development	2015-06-09 11:40:52 -07:00
MatterSlice@364e78d56b	Merge branch '1.2.3' into development	2015-06-09 11:40:52 -07:00