#
# ChangeLog for branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS
#
# Generated by Trac 1.0.1
# 2024-07-14T14:11:20+02:00

Mon, 23 Apr 2018 13:52:27 GMT davestorkey [9492]
	* branches/UKMO/dev_merge_2017_restart_datestamp_GO6_mixing (copied)

	Temporary UKMO branch of dev_merge_2017 to implement datestamping of ...


Wed, 13 Dec 2017 18:01:03 GMT timgraham [9024]
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SHARED/namelist_ref (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/VORTEX (copied)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/EXP00/namelist_cfg (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/Namelists/nam_wad (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/WAD_doc.pdf (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/WAD_doc.tex (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_DOCS/references.bib (copied)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/domain.F90 (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_istate.F90 (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/usrdef_zgr.F90 (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/cfg.txt (modified)
	* branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt (modified)

	Resolved conflicts in namelists