Merge branch 'develop' of ssh://git.psi.ch/sinqdev/sics into develop

This commit is contained in:
2016-07-01 10:58:37 +02:00
10 changed files with 169 additions and 28 deletions

View File

@ -45,7 +45,7 @@ SOBJ = network.o ifile.o conman.o SCinter.o splitter.o passwd.o \
singlenb.o simindex.o simidx.o uselect.o singletas.o motorsec.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 \
singlebinb.o taskobj.o sctcomtask.o tasmono.o multicountersec.o lscprot.o \
messagepipe.o sicsget.o remoteobject.o pmacprot.o charbychar.o binprot.o \
cnvrt.o tclClock.o tclDate.o tclUnixTime.o stack_trace.o logv2.o outcode.o