New URL for NEMO forge!

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6140 – NEMO

Changeset 6140

2015-12-21T12:35:23+01:00 (8 years ago)

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://
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://
to switch working copy

svn merge --reintegrate svn+ssh://
to merge the branch into the trunk and then commit - no conflicts at this stage.

34 deleted
345 edited
22 copied

Note: See TracChangeset for help on using the changeset viewer.