Lars Brubaker bc9d9ca9c0 Merge remote-tracking branch 'origin/1.7' into design_tools ... # Conflicts: # StaticData/SliceSettings/Properties.json		2017-04-14 12:51:17 -07:00
..
Layouts.txt	Merge remote-tracking branch 'origin/1.7' into design_tools	2017-04-14 12:51:17 -07:00
Properties.json	Merge remote-tracking branch 'origin/1.7' into design_tools	2017-04-14 12:51:17 -07:00