Merge branch 'mc++' into mc-merge

[simgrid.git] / src / xbt / mmalloc / mm.c

diff --git a/src/xbt/mmalloc/mm.c b/src/xbt/mmalloc/mm.c
index ade101adae10aef5f9a5da88fbdd028134d0b005..074dec3e6411bc23f8a1a00755d66339fba4cca4 100644 (file)
--- a/src/xbt/mmalloc/mm.c
+++ b/src/xbt/mmalloc/mm.c
@@ -6,7 +6,7 @@
 
 /* Copyright 1996, 2000 Free Software Foundation  */
 
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it