• Jelte Jansen's avatar
    [master] Merge branch 'trac495' · 76022a7e
    Jelte Jansen authored
    Conflicts:
    	src/lib/Makefile.am
    	src/lib/asiolink/Makefile.am
    	src/lib/asiolink/tcp_socket.h
    	src/lib/asiolink/tests/Makefile.am
    	src/lib/nsas/asiolink.h
    	src/lib/resolve/recursive_query.cc
    76022a7e
Makefile.am 2.38 KB