From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 15 Mar 2016 21:13:41 +0000 (+0100)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_13~412
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/5e3bf40dc2cd7bc003f520885915dd3874a89ff9?hp=2e11a7ad5b33b2c9258e74378916b8f8f1f2e0cd

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

diff --git a/teshsuite/surf/trace_usage/trace_usage.cpp b/teshsuite/surf/trace_usage/trace_usage.cpp
index 8341c2f5d7..6b04385abd 100644
--- a/teshsuite/surf/trace_usage/trace_usage.cpp
+++ b/teshsuite/surf/trace_usage/trace_usage.cpp
@@ -8,7 +8,7 @@
 
 #include "surf/surf.h"
 #include "xbt/log.h"
-#include "src/surf/network_cm02.hpp"
+#include "src/surf/network_interface.hpp"
 #include "src/surf/trace_mgr.hpp"
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(surf_test, "Messages specific for surf example");