resolve merge conflict with peerinfo plugin move
[oweals/gnunet.git] / src / peerinfo-tool /
drwxr-xr-x   ..
-rw-r--r-- 40 .gitignore
-rw-r--r-- 1350 Makefile.am
-rw-r--r-- 21444 gnunet-peerinfo.c
-rw-r--r-- 5001 gnunet-peerinfo_plugins.c
-rw-r--r-- 1474 gnunet-peerinfo_plugins.h
-rwxr-xr-x 3899 test_gnunet_peerinfo.py.in
-rw-r--r-- 209 test_gnunet_peerinfo_data.conf