X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=blobdiff_plain;f=Changelog;h=534d4755251e0f31f68287ae3f3dfeea40b73522;hp=b84d319a790012159b274beabf77d19036faf307;hb=cfd3f3ea9ccac7a6b9cb0e802b4c9e5927a506f6;hpb=9453fc761eb545fcb727824c94d012dbf3931951

diff --git a/Changelog b/Changelog
index b84d319..534d475 100644
--- 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