Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge remote-tracking branch 'origin/master'
authorjean-noel quintin <jnquintin@dhcp-892b9b4c.ucd.ie>
Wed, 3 Oct 2012 15:28:45 +0000 (16:28 +0100)
committerjean-noel quintin <jnquintin@dhcp-892b9b4c.ucd.ie>
Wed, 3 Oct 2012 15:28:45 +0000 (16:28 +0100)
commit0afab0e550e09d35a4aaaae802c7f2ea17d2b860
tree4379368e500d246f536787b9b694ed9b5273b2ab
parentaa64b0469b0967780beb549867c2907c14525443
parenta16415ffeee5802d0ed9ea0bf25910eace0aa832
Merge remote-tracking branch 'origin/master'

Conflicts:
src/smpi/smpi_base.c
src/smpi/private.h
src/smpi/smpi_base.c