From b75f934697a52450f060cb676e42ce0802d27906 Mon Sep 17 00:00:00 2001
From: Dominik Christ <d.christ@wikki.co.uk>
Date: Thu, 31 Jul 2014 15:53:49 +0100
Subject: [PATCH] Added file: Changelog.current

---
 Changelog.current | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 Changelog.current

diff --git a/Changelog.current b/Changelog.current
new file mode 100644
index 000000000..319041866
--- /dev/null
+++ b/Changelog.current
@@ -0,0 +1,37 @@
+################################################################################
+This file contains brief description of the changes introduced by merging 
+branches
+
+There are two secions: feature and bugfix
+
+The general format should be:
+Branchname (sans "bugfix/" of "feature/" prefix)
+Author: Contributor name; Merge: Code maintainer name
+One or two lines describing the bugfix or feature
+
+################################################################################
+
+** Feature
+
+
+
+** Bugfix
+* updatePreconfiguredBoundaryTuts
+Author: Hrvoje Jasak; Merge: Dominik Christ
+Updated tutorials which use mixing plane and had broken preconfigured boundary
+files
+
+* ReleaseNotesInstallationVersionNumber
+Author: Hrvoje Jasak; Merge: Dominik Christ
+Bumped version number in ReleaseNotes and updated links to SourceForce pages
+
+* Intel14Port
+Author: Hrvoje Jasak; Merge: Dominik Christ
+Updated wmake/rules for compilation with ICC 14
+
+* processorPointPatch
+Author: Zeljko Tukovic; Merge: Dominik Christ
+Correct interpolation of point data on processor boundaries after parallel 
+topological changes
+
+