Commit graph

3 commits

Author SHA1 Message Date
Adèle Harrissart
651e722de7 Merge branch 'moving-eompi' into 'moving-eoserial'
Conflicts:
	CMakeLists.txt
	cmake/module/FindParadiseo.cmake
2014-06-17 15:46:42 +02:00
Adèle Harrissart
b6ec15c911 Modifications on eompi/src/CMakeLists.txt file (module paths). 2014-06-17 14:53:23 +02:00
Adèle Harrissart
a4f5fd8012 Moving out ./eo/src/mpi/ content -> ./eompi/src/ 2014-06-17 09:38:11 +02:00