Merge branch 'master' of gitorious.psi.ch:sinqdev/sics into maverick

2015-04-23 16:00:02 +02:00
parent f82197623e 04906f672a
commit cdb9a8fba2
12 changed files with 1113 additions and 193 deletions
--- a/3
+++ b/3
@ -46,7 +46,8 @@ SOBJ =  network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
       rwpuffer.o asynnet.o background.o countersec.o hdbtable.o velosec.o \
       histmemsec.o sansbc.o sicsutil.o strlutil.o genbinprot.o trace.o\
       singlebinb.o taskobj.o sctcomtask.o tasmono.o multicountersec.o \
-       messagepipe.o sicsget.o remoteobject.o 
+       messagepipe.o sicsget.o remoteobject.o pmacprot.o charbychar.o binprot.o \
+       cnvrt.o 
 
 MOTOROBJ = motor.o  simdriv.o  
 COUNTEROBJ =  countdriv.o simcter.o counter.o