Merge branch 'master' into cuda_concurrency
authorErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Thu, 31 Jul 2014 14:03:51 +0000 (16:03 +0200)
committerErnest Galbrun <ernest.galbrun@univ-lorraine.fr>
Thu, 31 Jul 2014 14:03:51 +0000 (16:03 +0200)
commitae26368e78e94125ab8bf4bc25663b63d345833d
tree81835c5bde793ee15280225ab385011c4155cbba
parent917107e6355e2a25f0b83dff8394c4afa08a19e8
parent1a1097ab2307dfdd23771df011a31c19cf593810
Merge branch 'master' into cuda_concurrency