Merge branch 'v2.5'

plumed · Dec 15, 2019 · c090f11 · c090f11
2 parents ca99d02 + 9968f2a
commit c090f11
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CHANGES/v2.5.md b/CHANGES/v2.5.md
@@ -204,3 +204,9 @@ For users:
     when installing from PyPI, to avoid cython dependency.
   - Using python 2 to create the cpp file uploaded on PyPI (this will change to python 3 in 2.6, see \issue{502}).
 - Module VES: Fixed a bug in updating of bias potential in \ref VES_LINEAR_EXPANSION that is present for certain integrators that call the calculation of the bias multiple times (see [here](https://groups.google.com/d/msg/plumed-users/kPZu_tNZtgk/LrkS0EqrCQAJ)) and replica exchange.
+
+## Version 2.5.4 ()
+
+For users:
+- Includes all fixes up to 2.4.7
+
diff --git a/user-doc/tutorials/aa-lugano-6a.txt b/user-doc/tutorials/aa-lugano-6a.txt
@@ -14,7 +14,7 @@ Once this tutorial is completed students will have used PLUMED coupled with LAMM
 
 \section lugano-6a-resources Resources
 
-The \tarball{lugano-4} for this project contains the following files:
+The \tarball{lugano-6a} for this project contains the following files:
 
 - lammps-equilibration.in : The input for LAMMPS that we will use for our setup and equilibration steps of our investigation
 - lammps-production.in : The input for LAMMPS that will be used for the production steps of our investigation