[Dart-dev] DART/branches Revision: 12807

[dart at ucar.edu]

thoar at ucar.edu
2018-08-31 11:53:43 -0600 (Fri, 31 Aug 2018)
108
reintegrate cice merge information.

Should not have done an 'svn commit' without using the '.' directory.




Index: DART/branches/rma_trunk
===================================================================
--- DART/branches/rma_trunk	2018-08-31 17:50:26 UTC (rev 12806)
+++ DART/branches/rma_trunk	2018-08-31 17:53:43 UTC (rev 12807)

Property changes on: DART/branches/rma_trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -54,4 +54,5 ##
 /DART/branches/rma_types_kinds:11202-11236
 /DART/branches/rma_updates_nancy:11615-11676
 /DART/branches/trunk_with_cam_style:9467-9534
+/DART/branches/yz-cice:12771-12805
 /DART/trunk:6306-9550
\ No newline at end of property
Modified: DART/branches/rma_trunk/CHANGELOG
===================================================================
--- DART/branches/rma_trunk/CHANGELOG	2018-08-31 17:50:26 UTC (rev 12806)
+++ DART/branches/rma_trunk/CHANGELOG	2018-08-31 17:53:43 UTC (rev 12807)
@@ -799,7 +799,7 @@
 - increased the maximum number of input files to obs_diag from 100 to 10000.
 
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-+ Aug 31 2018 :: reintegrate CICE branch (yz-cice)          $Revision$
++ Aug 31 2018 :: reintegrate CICE branch (yz-cice)             Revision: 12806
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 - Yongfei Zhang and Cecilia Bitz had improvements to the CICE model and