Merge branch 'master' of ssh://gitlab.psi.ch/sinqdev/sicspsi

2016-12-14 09:10:01 +01:00
parent 4789b35f9a 4369104480
commit 8362096223
3 changed files with 81 additions and 2 deletions
--- a/2
+++ b/2
@ -26,7 +26,7 @@ OBJ=psi.o buffer.o ruli.o  sps.o pimotor.o \
 	pfeifferprot.o termprot.o phytron.o autowin.o eigera2.o \
 	jvlprot.o  \
 	eigermono.o sputterprot.o zwickroll.o astriumnet.o poldifold.o \
-	epicsadapter.o
+	epicsadapter.o zebraswap.o

 .SECONDARY.: sanslirebin.c