Merge branch 'agy/intersect_1D'

author geay <anthony.geay@cea.fr>

Fri, 4 Jul 2014 13:08:13 +0000 (15:08 +0200)

committer geay <anthony.geay@cea.fr>

Fri, 4 Jul 2014 13:08:13 +0000 (15:08 +0200)
author geay <anthony.geay@cea.fr>
Fri, 4 Jul 2014 13:08:13 +0000 (15:08 +0200)
committer geay <anthony.geay@cea.fr>
Fri, 4 Jul 2014 13:08:13 +0000 (15:08 +0200)
diff --cc src/MEDCoupling/MEDCouplingCartesianAMRMesh.cxx
Simple merge
author	geay <anthony.geay@cea.fr>
	Fri, 4 Jul 2014 13:08:13 +0000 (15:08 +0200)
committer	geay <anthony.geay@cea.fr>
	Fri, 4 Jul 2014 13:08:13 +0000 (15:08 +0200)