Commit d068fe3e authored by Jeroen Vreeken's avatar Jeroen Vreeken
Browse files

Merge branch 'controller_bus' into corso2013

Conflicts:
	controller/controller/controller_load.h
parents 91581f32 cf2b006f
......@@ -27,4 +27,5 @@ int controller_load_shell_add(void);
int controller_load(char *filename);
#endif /* _INCLUDE_CONTROLLER_LOAD_H_ */
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment