Merge branch 'master' into S4U

[simgrid.git] / include / xbt.h

diff --git a/include/xbt.h b/include/xbt.h
index 3a9bc58..33a9130 100644 (file)
--- a/include/xbt.h
+++ b/include/xbt.h
@@ -1,6 +1,7 @@
 /* xbt.h - Public interface to the xbt (SimGrid's toolbox)                  */
 
-/* Copyright (c) 2004-2012. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2004-2014. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -28,10 +29,10 @@
 #include <xbt/parmap.h>
 
 #include <xbt/peer.h>
-#include <xbt/datadesc.h>
 #include <xbt/config.h>
 #include <xbt/cunit.h>
 
 #include <xbt/xbt_os_thread.h>
+#include <xbt/xbt_os_time.h>
 
 #endif                          /* xbt_H */