4 commits

Author	SHA1	Message	Date
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
Brad Davis	d5afb3a49b	Move non-automated tests into new folder	2018-05-09 13:20:47 -07:00