Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (6 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge —reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/DOC/NEMO_book.tex

    r5405 r6140  
    215215%\date{\today} 
    216216\date{ 
    217 November 2014  \\ 
    218 {\small  -- version 3.6 --} \\ 
     217November 2015  \\ 
     218{\small  -- draft of version 4.0 --} \\ 
    219219~  \\ 
    220220\textit{\small Note du P\^ole de mod\'{e}lisation de l'Institut Pierre-Simon Laplace No 27 }\\ 
     
    301301 
    302302\include{./TexFiles/Chapters/Chap_STO}          % Stochastic param. 
     303 
     304\include{./TexFiles/Chapters/Chap_DIU}          % Diurnal SST models. 
    303305 
    304306\include{./TexFiles/Chapters/Chap_MISC}         % Miscellaneous topics 
Note: See TracChangeset for help on using the changeset viewer.