Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
Merge branch 'v3_10_x'
authorArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Mon, 4 Nov 2013 20:47:23 +0000 (21:47 +0100)
committerArnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Mon, 4 Nov 2013 20:47:23 +0000 (21:47 +0100)
commitc892dfb9d21349fa65a0d9920f0884d2ba8e1b5c
treeae4c749b8c8b56fca835f1b2247e95ea8d2c258b
parent749aa9b0446802ea8db0fb604154c37993ac7cf2
parent756023d8ea2a5224dba23ad26fd8f26576a0b9a3
Merge branch 'v3_10_x'

Conflicts:
CMakeLists.txt
ChangeLog

Fixed by defining current version as 3.11-devel.
CMakeLists.txt
ChangeLog