Merge branch 'hardware-interface'

Conflicts: src/core/src/core.h
2014-04-07 00:57:37 -04:00 · 2014-04-07 00:57:37 -04:00 · f446f79da2
commit f446f79da2
parent 9b6041d818 efef514fd8
34 changed files with 1786 additions and 168 deletions
--- a/src/core/src/core.h
+++ b/src/core/src/core.h
@ -55,6 +55,9 @@ void Stop();
 /// Initialize the core
 int Init();

+/// Shutdown the core
+void Shutdown();
+
 } // namespace

 ////////////////////////////////////////////////////////////////////////////////////////////////////