merge conflict resolved

[simgrid.git] / src / simix / smx_network.c

diff --git a/src/simix/smx_network.c b/src/simix/smx_network.c
index d234bb3..6c52ac7 100644 (file)
--- a/src/simix/smx_network.c
+++ b/src/simix/smx_network.c
@@ -67,6 +67,11 @@ void SIMIX_rdv_free(void *data)
   xbt_free(rdv);  
 }
 
+xbt_dict_t SIMIX_get_rdv_points()
+{
+  return rdv_points;
+}
+
 smx_rdv_t SIMIX_rdv_get_by_name(const char *name)
 {
   return xbt_dict_get_or_null(rdv_points, name);