diff options
| author | t3sserakt <t3ss@posteo.de> | 2019-06-25 15:53:30 +0200 |
|---|---|---|
| committer | t3sserakt <t3ss@posteo.de> | 2019-06-25 15:53:30 +0200 |
| commit | 28d3e0676f262e495c6d5c49bbedd5ce65502cee (patch) | |
| tree | 3631b2f033a913aac3cd806e541e3391f0cec7e5 /src/cadet/gnunet-service-cadet.c | |
| parent | d2ed51b63d955a590a461e911a3d6fa6a9248fe5 (diff) | |
| parent | 17611641fe7da3d2711e1f20eaf2ee81faf0e702 (diff) | |
| download | gnunet-28d3e0676f262e495c6d5c49bbedd5ce65502cee.tar.gz gnunet-28d3e0676f262e495c6d5c49bbedd5ce65502cee.zip | |
Merge branch 'master' into cadet_option
Diffstat (limited to 'src/cadet/gnunet-service-cadet.c')
| -rw-r--r-- | src/cadet/gnunet-service-cadet.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cadet/gnunet-service-cadet.c b/src/cadet/gnunet-service-cadet.c index e29330f99..209f7d392 100644 --- a/src/cadet/gnunet-service-cadet.c +++ b/src/cadet/gnunet-service-cadet.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | * - channel: logical link between two clients, on the same or different peers. | 32 | * - channel: logical link between two clients, on the same or different peers. |
| 33 | * have properties like reliability. | 33 | * have properties like reliability. |
| 34 | */ | 34 | */ |
| 35 | |||
| 36 | #include "platform.h" | 35 | #include "platform.h" |
| 37 | #include "gnunet_util_lib.h" | 36 | #include "gnunet_util_lib.h" |
| 38 | #include "cadet.h" | 37 | #include "cadet.h" |