From 5d5c5b0c102aa9dbd849277c3e3b831c7cdd91fe Mon Sep 17 00:00:00 2001
From: jranke <jranke@edb9625f-4e0d-4859-8d74-9fd3b1da38cb>
Date: Sun, 17 Nov 2013 15:52:42 +0000
Subject: Conflicts: 	README.md 	TODO

git-svn-id: svn+ssh://svn.r-forge.r-project.org/svnroot/kinfit/pkg/mkin@163 edb9625f-4e0d-4859-8d74-9fd3b1da38cb
---
 ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 852ad466..74c161fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-17  Johannes Ranke <jranke@uni-bremen.de> for mkin (0.9-25)
+
+	* Change vignette format from Sweave to knitr
+	* Split examples vignette to FOCUS_L and FOCUS_Z
+
 2013-11-06  Johannes Ranke <jranke@uni-bremen.de> for mkin (0.9-24)
 
 	* Bugfix re-enabling the fixing of any combination of initial values
-- 
cgit v1.2.1