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

author Martin Quinson <martin.quinson@loria.fr>

Sun, 28 Feb 2016 11:58:20 +0000 (12:58 +0100)

committer Martin Quinson <martin.quinson@loria.fr>

Sun, 28 Feb 2016 11:58:20 +0000 (12:58 +0100)
author Martin Quinson <martin.quinson@loria.fr>
Sun, 28 Feb 2016 11:58:20 +0000 (12:58 +0100)
committer Martin Quinson <martin.quinson@loria.fr>
Sun, 28 Feb 2016 11:58:20 +0000 (12:58 +0100)
diff --cc src/bindings/lua/lua_platf.cpp
Simple merge
diff --cc src/xbt/log.c
Simple merge
diff --cc tools/cmake/DefinePackages.cmake
Simple merge
author	Martin Quinson <martin.quinson@loria.fr>
	Sun, 28 Feb 2016 11:58:20 +0000 (12:58 +0100)
committer	Martin Quinson <martin.quinson@loria.fr>
	Sun, 28 Feb 2016 11:58:20 +0000 (12:58 +0100)
		1	2
src/bindings/lua/lua_platf.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/xbt/log.c	patch \|	diff1 \|	diff2 \|	blob \| history
tools/cmake/DefinePackages.cmake	patch \|	diff1 \|	diff2 \|	blob \| history