Sebastian Kuzminsky 61ff89f2ad Merge branch '2.6' into 2.7 ... Conflicts: tests/module-loading/rtapi-app-main-fails/test.sh (comp/halcompile rename)		2014-12-28 14:09:04 -07:00
..
checkresult	rtapi_app_main_fails tests: make it work on rtai too	2014-12-28 13:57:01 -07:00
rtapi_app_main_fails.comp	rtapi_app_main_fails tests: make it work on rtai too	2014-12-28 13:57:01 -07:00
setup.hal	rtapi_app_main_fails tests: make it work on rtai too	2014-12-28 13:57:01 -07:00
test.sh	Merge branch '2.6' into 2.7	2014-12-28 14:09:04 -07:00