changelog

diff --git a/Changelog b/Changelog
index b84d319..534d475 100644 (file)
--- a/Changelog
+++ b/Changelog
@@ -4,3 +4,5 @@
 2012-04-03: hotfixes and examples added
 
 2014-12-11: Version 3.2.1 released. Sidecain-backbone torsionals introduced for the GAB and E0L2Y force fields. A number of bugs fixed, manuals revised. Minimization alone added (directory src_MIN and MINIM in the bin subdirectory)
+
+2017-09-25: merge with prerelease 3.2.1 
\ No newline at end of file