Merge branch 'errtxt'

Also made sinqepicsApp work with the module based build system now being operational at PSI
Conflicts:
	iocBoot/iocsinqEPICS/envPaths
	iocBoot/iocsinqEPICS/st.cmd
	sinqEPICSApp/src/Makefile
This commit is contained in:
2017-07-04 08:38:40 +02:00
14 changed files with 241 additions and 41 deletions

View File

@ -1,4 +1,4 @@
#!/opt/amor/epics/sinqEPICS
#!../../bin/linux-x86-debug/sinqEPICS
cd /opt/amor/epics