Lars Brubaker 174983ad7e Merge remote-tracking branch 'origin/1.6' ... # Conflicts: # Submodules/agg-sharp		2017-01-10 18:49:54 -08:00
..
MatterControl	Merge remote-tracking branch 'origin/1.6'	2017-01-10 18:49:54 -08:00
Properties	Extract automation tests to a separate assembly to ensure isolation/clean startup	2015-12-13 17:29:01 -08:00
app.config	Consolidate AutomationTesterHarness into AutomationRunner	2016-10-19 07:44:09 -07:00
MatterControl.Tests.csproj	Took out old emulator and put in a new c# one	2017-01-10 12:24:01 -08:00
packages.config	Revise Agg automation	2016-10-25 07:38:48 -07:00