From: xrs <xrs@mail36.net>
Date: Tue, 2 Jan 2018 16:12:39 +0000 (+0100)
Subject: Merge branch 'master' of ssh://gnunet.org/gnunet
X-Git-Tag: v0.11.0pre66~257
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3611a5295f95fad5d9e1fdb3866e7db9ecf8f47e;p=oweals%2Fgnunet.git

Merge branch 'master' of ssh://gnunet.org/gnunet
---

3611a5295f95fad5d9e1fdb3866e7db9ecf8f47e
diff --cc src/multicast/test_multicast_multipeer.c
index 0fb515f54,7df1a8213..65c51c2e3
--- a/src/multicast/test_multicast_multipeer.c
+++ b/src/multicast/test_multicast_multipeer.c
@@@ -547,14 -546,13 +546,14 @@@ service_connect (void *cls
   * @param PEERS_REQUESTED size of the 'peers' array
   * @param links_succeeded number of links between peers that were created
   * @param links_failed number of links testbed was unable to establish
 - */ static void
 + */ 
 +static void
  testbed_master (void *cls,
-      struct GNUNET_TESTBED_RunHandle *h,
-      unsigned int num_peers,
-      struct GNUNET_TESTBED_Peer **p,
-      unsigned int links_succeeded,
-      unsigned int links_failed)
+                 struct GNUNET_TESTBED_RunHandle *h,
+                 unsigned int num_peers,
+                 struct GNUNET_TESTBED_Peer **p,
+                 unsigned int links_succeeded,
+                 unsigned int links_failed)
  {
    /* Testbed is ready with peers running and connected in a pre-defined overlay
       topology (FIXME)  */