Commit graph

2 commits

Author SHA1 Message Date
Kevin Pope
02022b8589 Slice engine info refactoring. 2014-08-20 12:14:45 -07:00
Kevin Pope
4759adbf3b Merge branch 'development' into greg-development
Conflicts:
	MatterControl.csproj
	StaticData/Translations/Master.txt
2014-08-20 10:52:47 -07:00