From 0a4e66bf3fc37892f7af1a25f93f0b254f830f3f Mon Sep 17 00:00:00 2001
From: Kostyantyn Vorobyov <kostyantyn.vorobyov@cea.fr>
Date: Tue, 19 Jul 2016 12:43:12 +0200
Subject: [PATCH] Changelog updates

---
 src/plugins/e-acsl/doc/Changelog | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/plugins/e-acsl/doc/Changelog b/src/plugins/e-acsl/doc/Changelog
index 8ca2fc45509..e77b3ffebb5 100644
--- a/src/plugins/e-acsl/doc/Changelog
+++ b/src/plugins/e-acsl/doc/Changelog
@@ -15,11 +15,21 @@
 #   E-ACSL: the Whole E-ACSL plug-in
 ###############################################################################
 
+=======
+-* E-ACSL       [2016/07/21] Enable reporting of stack traces during assertion
+	        failures in instrumented programs.
 -* E-ACSL       [2016/07/13] Add an e-acsl-gcc.sh option (--print--models)
 	        allowing to print the names of the supported memory models.
+-* E-ACSL       [2016/07/01] Add monitoring support for aligned memory
+	        allocation via posix_memalign and aligned alloc functions.
+-* E-ACSL       [2016/07/01] Add local version of GMP library customized for use
+	        with E-ACSL runtime library.
+-* E-ACSL       [2016/07/01] Add custom implementation of malloc for use with
+	        E-ACSL runtime library (via jemalloc library).
 -* E-ACSL       [2016/05/22] Add an e-acsl-gcc.sh option (--rte|-a) allowing to
-          annotate the source program with memory-safety assertions prior to
-          instrumentation.
+	        annotate the source program with memory-safety assertions prior to
+	        instrumentation.
+>>>>>>> Changelog updates
 -  E-ACSL       [2016/05/23] Re-implementation of the type system which
 	        improves the efficiency of the generated code over integers.
 -* E-ACSL       [2016/05/23] Fix bug #2191 about complicate structs and
-- 
GitLab