linse/sics
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into maverick

Browse Source 
- Removed epicsmotor from motor.c
- Fixed a bad define in tasscanub.h
Conflicts:
	makefile_macosx
This commit is contained in:
koennecke
2015-03-17 14:01:40 +01:00
parent bff0473ed6 0097a2f3cb
commit f82197623e
85 changed files with 2332 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
macosx_def
View File

@ -11,5 +11,6 @@
MFLAGS=-f makefile_macosx
HDFROOT=/usr/pkg
EPICS=/usr/local/epics
EPICSLIBS=-L$(EPICS)/lib/darwin-x86 -lca -lCom