#
# ChangeLog for branches/2014/dev_CNRS_CICE/DOC/NEMO_coding.conv.tex
#
# Generated by Trac 1.0.1
# 2024-06-03T04:23:48+02:00

Mon, 01 Dec 2014 08:51:17 GMT cetlod [4926]
	* branches/2014/dev_CNRS_CICE (copied)

	merge the CNRS branche with CICE


Fri, 14 Mar 2014 11:25:49 GMT smasson [4528]
	* trunk (moved)

	move dev_MERGE_2013 for 3.6 alpha onto the trunk, see #1257


