Lars Brubaker 3d43b1e9c3 Merge branch '1.2.3' into development ... Conflicts: Submodules/agg-sharp		2015-05-29 18:15:04 -07:00
..
agg-sharp@0062a94af7	Merge branch '1.2.3' into development	2015-05-29 18:15:04 -07:00
MatterSlice@314607f98b	Changed send to share	2015-05-28 07:49:33 -07:00