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
..
agg-sharp@5d0d2a2107	Merge remote-tracking branch 'origin/1.7' into design_tools	2017-04-14 12:51:17 -07:00
MatterSlice@4ec505aff0	Missed on frustum test.	2017-03-23 17:28:46 -07:00