John Jones 9bdfed92f1 Merge branch 'master' into yamux ... # Conflicts: # core/http_request.c		2017-11-29 06:21:49 -05:00
..
Makefile	Handle api and cli swarm connect	2017-10-12 10:12:54 -05:00
api.c	Fixed issue when receiving by POST method.	2017-10-12 20:08:21 -03:00
bootstrap.c	The API changed pthread to scope, so it can load multiple instances.	2017-09-20 14:39:26 -03:00
builder.c	The API changed pthread to scope, so it can load multiple instances.	2017-09-20 14:39:26 -03:00
client_api.c	Minor memory leak fixes	2017-09-28 15:43:03 -05:00
daemon.c	move api globals to struct	2017-09-25 08:55:42 -05:00
http_request.c	Merge branch 'master' into yamux	2017-11-29 06:21:49 -05:00
ipfs_node.c	More go compat fixes	2017-11-28 22:44:45 -05:00
net.c	Fixes for connections via secio	2017-03-02 16:18:02 -05:00
null.c	fix compiler warning	2017-11-28 23:42:17 -05:00
ping.c	Better handling of bad memory allocation	2017-10-05 15:14:47 -05:00
swarm.c	Minor fixes for yamux testing with GO	2017-11-23 07:45:06 -05:00