From 99d49adc251db7a91ded3686dbd6202643083241 Mon Sep 17 00:00:00 2001
From: Christoph Grueninger <christoph.grueninger@iws.uni-stuttgart.de>
Date: Wed, 9 Apr 2014 15:30:48 +0000
Subject: [PATCH] update CHANGELOG for holding changes 2.5 -> 2.6

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@12740 2fb0f335-1f38-0410-981e-8018bf24f1b0
---
 CHANGELOG | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index ec9b3c8d0c..9771d4d32b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,34 @@
+Differences Between DuMuX 2.5 and DuMuX 2.6
+===================================================
+
+* IMPORTANT NOTES:
+
+* IMPROVEMENTS and ENHANCEMENTS:
+
+* IMMEDIATE INTERFACE CHANGES not allowing/requiring a deprecation period:
+
+* Deprecated CLASSES/FILES, to be removed after 2.6:
+
+* Deprecated PROPERTY NAMES, to be removed after 2.6: BEWARE: The compiler will
+  not print any warning if a deprecated property name is used.
+
+* Deprecated CONSTANTS/ENUMS, to be removed after 2.6: BEWARE: Older compilers 
+  will not print any warning if a deprecated constant/enum is used.
+
+* Deprecated public MEMBER VARIABLES, to be removed after 2.6: BEWARE: Older
+  compilers will not print any warning if a deprecated public member variable 
+  is used.
+
+* Deprecated MEMBER FUNCTIONS, to be removed after 2.6:
+
+* Deprecated MACROS, to be removed after 2.6: BEWARE: The compiler will not
+  print any warning if a deprecated macro is used.
+
+* DELETED classes/files, property names, constants/enums, 
+  member functions, which have been deprecated in DuMuX 2.5:
+  Everything listed as deprecated below has been removed.
+
+
 Differences Between DuMuX 2.4 and DuMuX 2.5
 ===================================================
 
-- 
GitLab