Commit graph

3 commits

Author SHA1 Message Date
Brad Davis
ef6c4f6f66 Working on JSON parsing and cleanup
Conflicts:
	libraries/controllers/src/controllers/Route.cpp
	libraries/controllers/src/controllers/ScriptingInterface.cpp
	libraries/controllers/src/controllers/StandardController.cpp
	libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:15:36 -07:00
Brad Davis
4f8e2c9f6b Fix JSON format errors 2015-10-15 13:18:04 -07:00
samcake
c02d33c17c Adding example mapping files 2015-10-09 17:27:50 -07:00