X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=.gitignore;h=8e923b5b62bf83d9308710db00d3f1128897817b;hb=48fa0ba8abea2464b2df67247ae1bd50d0f1f934;hp=7105c5d942997a1adcc0ebbef88d43896be37e22;hpb=39319f02e2952aa5dca8225f4e7229bec55ba84c;p=oweals%2Fgnunet.git

diff --git a/.gitignore b/.gitignore
index 7105c5d94..8e923b5b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-*~
+!*~
 */*~
 # /
+*log
 /ChangeLog
 /INSTALL
 /configure.lineno
@@ -120,7 +121,7 @@
 /pkgconfig/gnunetpostgres.pc
 /pkgconfig/gnunetnamestore.pc
 /pkgconfig/gnunetmysql.pc
-/pkgconfig/gnunetmesh.pc
+/pkgconfig/gnunetcadet.pc
 /pkgconfig/gnunetlockmanager.pc
 /pkgconfig/gnunetdnsparser.pc
 /pkgconfig/gnunetdns.pc
@@ -516,8 +517,8 @@
 
 # /src/fs/
 /src/fs/libgnunetfstest.a
-/src/fs/test_gnunet_service_fs_p2p_mesh
-/src/fs/test_fs_download_mesh
+/src/fs/test_gnunet_service_fs_p2p_cadet
+/src/fs/test_fs_download_cadet
 /src/fs/test_pseudonym
 /src/fs/test_gnunet_service_fs_p2p_stream
 /src/fs/test_fs_download_stream
@@ -757,44 +758,40 @@
 /src/integration-tests/Makefile
 /src/integration-tests/gnunet_testing.py
 
-# /src/mesh/
-/src/mesh/libgnunetmeshtest.a
-/src/mesh/test_mesh_small_multicast
-/src/mesh/test_mesh_small_unicast
-/src/mesh/mesh.conf
-/src/mesh/test_mesh_path_api
-/src/mesh/mesh_topo_initial
-/src/mesh/gnunet-mesh-profiler
-/src/mesh/.profiler.conf
-/src/mesh/test_mesh_single
-/src/mesh/test_mesh_small_forward
-/src/mesh/test_mesh_small_signal
-/src/mesh/test_mesh_small_keepalive
-/src/mesh/test_mesh_small_speed
-/src/mesh/test_mesh_small_speed_min
-/src/mesh/test_mesh_small_speed_nobuf
-/src/mesh/test_mesh_small_speed_ack
-/src/mesh/test_mesh_small_speed_backwards
-/src/mesh/test_mesh_small_speed_min_backwards
-/src/mesh/test_mesh_small_speed_nobuf_backwards
-/src/mesh/test_mesh_small_speed_ack
-/src/mesh/test_mesh_small_speed_reliable
-/src/mesh/test_mesh_small_speed_reliable_backwards
-/src/mesh/test_mesh_api
-/src/mesh/test_mesh_tree_api
-/src/mesh/test_mesh_local
-/src/mesh/test_mesh_local_traffic_fwd
-/src/mesh/test_mesh_local_traffic_bck
-/src/mesh/test_mesh_local_traffic_both
-/src/mesh/test_mesh_small
-/src/mesh/test_mesh_2dtorus
-/src/mesh/Makefile.in
-/src/mesh/Makefile
-/src/mesh/.deps
-/src/mesh/gnunet-service-mesh
-/src/mesh/gnunet-mesh
-/src/mesh/*log
-/src/mesh/*.trs
+# /src/cadet/
+/src/cadet/libgnunetcadettest.a
+/src/cadet/cadet.conf
+/src/cadet/test_cadet_path_api
+/src/cadet/cadet_topo_initial
+/src/cadet/gnunet-cadet-profiler
+/src/cadet/.profiler.conf
+/src/cadet/test_cadet_single
+/src/cadet/test_cadet*_forward
+/src/cadet/test_cadet*_signal
+/src/cadet/test_cadet*_keepalive
+/src/cadet/test_cadet*_speed
+/src/cadet/test_cadet*_speed_min
+/src/cadet/test_cadet*_speed_ack
+/src/cadet/test_cadet*_speed_backwards
+/src/cadet/test_cadet*_speed_min_backwards
+/src/cadet/test_cadet*_speed_ack
+/src/cadet/test_cadet*_speed_reliable
+/src/cadet/test_cadet*_speed_reliable_backwards
+/src/cadet/test_cadet_api
+/src/cadet/test_cadet_tree_api
+/src/cadet/test_cadet_local
+/src/cadet/test_cadet_local_traffic_fwd
+/src/cadet/test_cadet_local_traffic_bck
+/src/cadet/test_cadet_local_traffic_both
+/src/cadet/test_cadet_small
+/src/cadet/test_cadet_2dtorus
+/src/cadet/Makefile.in
+/src/cadet/Makefile
+/src/cadet/.deps
+/src/cadet/gnunet-service-cadet
+/src/cadet/gnunet-cadet
+/src/cadet/*log
+/src/cadet/*.trs
 
 
 # /src/multicast/
@@ -894,6 +891,7 @@
 /src/nse/gnunet-service-nse
 /src/nse/gnunet-nse-profiler
 /src/nse/.deps
+/src/nse/gnunet-nse
 
 # /src/peerinfo/
 /src/peerinfo/test_peerinfo_shipped_hellos