Steffen Vogel c2f83b01fd Merge branch 'ws-relay' into develop ... # Conflicts: # include/villas/node/config.h.in # include/villas/utils.h # lib/CMakeLists.txt # lib/nodes/websocket.c # lib/utils.c # lib/web.c # src/CMakeLists.txt # src/villas-pipe.cpp		2019-01-12 13:48:29 +01:00
..
fiware	refactor: update copyright years	2018-08-20 18:40:03 +02:00
tc	refactor: update copyright years	2018-08-20 18:40:03 +02:00
CMakeLists.txt	porting tools to C++	2018-07-03 20:44:48 +02:00
conf2json.cpp	Merge branch 'ws-relay' into develop	2019-01-12 13:48:29 +01:00
docker.sh	refactor: update copyright years	2018-08-20 18:40:03 +02:00
integration-tests-helper.sh	compatability fixes in shell script	2018-11-30 21:37:52 +01:00
integration-tests.sh	tests: use correct bash version in a MacPorts environment	2018-11-30 21:38:19 +01:00
rmsem.cpp	cpp: replace <stdio.h> by <iostream>	2018-07-03 21:04:28 +02:00
rmshm.cpp	cpp: replace <stdio.h> by <iostream>	2018-07-03 21:04:28 +02:00
villas-signal.sh	started writing wrapper shell script for obsoleting villas-signal	2018-11-30 21:36:26 +01:00
villas.sh	refactor: update copyright years	2018-08-20 18:40:03 +02:00
zmq-keygen.cpp	fix whitespaces	2018-12-04 00:24:51 +01:00