Logo AND Algorithmique Numérique Distribuée
Public GIT Repository
projects / simgrid.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0c13871)
Merge branch 'master' into vmtrace
authorArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Thu, 17 Jan 2013 13:03:10 +0000 (14:03 +0100)
committerArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Thu, 17 Jan 2013 13:03:10 +0000 (14:03 +0100)
Conflicts:
buildtools/Cmake/DefinePackages.cmake
include/surf/simgrid_dtd.h
include/xbt/graphxml.h
src/instr/instr_config.c
src/instr/instr_private.h
src/simdag/dax_dtd.c
src/simdag/dax_dtd.h
src/surf/simgrid_dtd.c
src/xbt/graphxml.c


No differences found
Clone of SimGrid repository with local patches