John Jones 9bdfed92f1 Merge branch 'master' into yamux ... # Conflicts: # core/http_request.c		2017-11-29 06:21:49 -05:00
..
base.c	namesys/path: Renamed the function names to match the rest of the project.	2016-12-05 08:55:17 -03:00
dns.c	namesys: Fixed some compilation errors.	2017-02-13 08:52:22 -03:00
is_domain_test.c	namesys/path: Renamed the function names to match the rest of the project.	2016-12-05 08:55:17 -03:00
isdomain.c	Fixed some compiler warnings	2017-02-13 05:34:56 -05:00
Makefile	More work on ipns publisher and resolver	2017-09-21 13:59:06 -05:00
name.c	Changed some API calls to use POST method.	2017-10-12 20:12:28 -03:00
namesys.c	Fixed warnings	2017-07-17 16:14:40 -05:00
pb.c	testing of using api for binary files	2017-10-04 06:34:37 -05:00
proquint.c	namesys: Incomplete code disabled to not break compilation.	2017-02-14 07:56:07 -03:00
proquint_test.c	namesys/path: Renamed the function names to match the rest of the project.	2016-12-05 08:55:17 -03:00
publisher.c	New way of swarm connection	2017-10-23 15:22:12 -05:00
resolver.c	Better handling of bad memory allocation	2017-10-05 15:14:47 -05:00
routing.c	Better handling of bad memory allocation	2017-10-05 15:14:47 -05:00