A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
mmalloc
/
mm.c
diff --git
a/src/xbt/mmalloc/mm.c
b/src/xbt/mmalloc/mm.c
index e435f7f0b959caf74ab4b772b788ac55ca9b2844..d5d5610b18500679614152f88cb0d77dc0580214 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 1996, 2000 Free Software Foundation */
-/* Copyright (c) 2010. The SimGrid Team.
+/* Copyright (c) 2010
, 2012
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-19,6
+19,6
@@
#include "mmalloc.c"
#include "mrealloc.c"
#include "mmorecore.c"
#include "mmalloc.c"
#include "mrealloc.c"
#include "mmorecore.c"
-#include "mm_module.c"
#include "mm_legacy.c"
#include "mm_legacy.c"
+#include "mm_module.c"
#include "mm_diff.c"
#include "mm_diff.c"