From: Dawid Jagiela <lightnir@chem.univ.gda.pl>
Date: Thu, 20 Sep 2012 09:41:43 +0000 (+0200)
Subject: Merge branch 'devel' of mmka:unres into devel
X-Git-Tag: v.3.2~69^2~1
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=commitdiff_plain;h=f0acb96e53be46d6ab6b70acee45cf3dbcf654ff;hp=55f0f4a92c5bcdf031e84fc49f99d7ce63e9e5c1;p=unres.git

Merge branch 'devel' of mmka:unres into devel
---

diff --git a/Changelog b/Changelog
index 190290a..fdcb354 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
-3/4/2012: hotfixes and examples added
 
-4/4/2012: unres_MD source code tidied and uniform Makefiles for the 1GAB/4P and 1E0L_1L2Y force field created for gfortran (single-processor version) and ifort (single-processor and MPICH version) compilers.
+2012-04-04: unres_MD source code tidied and uniform Makefiles for the 1GAB/4P and 1E0L_1L2Y force field created for gfortran (single-processor version) and ifort (single-processor and MPICH version) compilers.
+
+2012-04-03: hotfixes and examples added
+