From d660df76d6c21ab38a0fd09c4950ab8c63ee7d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20B=C3=BChler?= <david.buhler@cea.fr>
Date: Thu, 29 Nov 2018 15:44:37 +0100
Subject: [PATCH] Updates VERSION and Changelog files for the master branch.

---
 Changelog                                      | 5 +++++
 VERSION                                        | 2 +-
 tests/misc/oracle/debug_category.16.res.oracle | 2 +-
 tests/misc/oracle/log-file.1.res.oracle        | 2 +-
 tests/misc/oracle/plugin-log-all.txt           | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Changelog b/Changelog
index 141ced448ff..d97c6803349 100644
--- a/Changelog
+++ b/Changelog
@@ -13,6 +13,11 @@
 # '#?nnn'  : OLD-BTS entry #nnn                                               #
 ###############################################################################
 
+##################################
+Open Source Release <next-release>
+##################################
+
+
 ################################
 Open Source Release 18.0 (Argon)
 ################################
diff --git a/VERSION b/VERSION
index fc004cb52c7..3a48ff126f4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-18.0
\ No newline at end of file
+18.0+dev
\ No newline at end of file
diff --git a/tests/misc/oracle/debug_category.16.res.oracle b/tests/misc/oracle/debug_category.16.res.oracle
index 708cc59e04f..75e2529443b 100644
--- a/tests/misc/oracle/debug_category.16.res.oracle
+++ b/tests/misc/oracle/debug_category.16.res.oracle
@@ -9,7 +9,7 @@
   
   Plug-in test aborted: internal error.
   Please report as 'crash' at http://bts.frama-c.com/.
-  Your Frama-C version is 18.0 (Argon).
+  Your Frama-C version is 18.0+dev (Argon).
   Note that a version and a backtrace alone often do not contain enough
   information to understand the bug. Guidelines for reporting bugs are at:
   http://bts.frama-c.com/dokuwiki/doku.php?id=mantis:frama-c:bug_reporting_guidelines
diff --git a/tests/misc/oracle/log-file.1.res.oracle b/tests/misc/oracle/log-file.1.res.oracle
index f80564b48f8..a7ef0e3d8b8 100644
--- a/tests/misc/oracle/log-file.1.res.oracle
+++ b/tests/misc/oracle/log-file.1.res.oracle
@@ -14,7 +14,7 @@
   
   Frama-C aborted: internal error.
   Please report as 'crash' at http://bts.frama-c.com/.
-  Your Frama-C version is 18.0 (Argon).
+  Your Frama-C version is 18.0+dev (Argon).
   Note that a version and a backtrace alone often do not contain enough
   information to understand the bug. Guidelines for reporting bugs are at:
   http://bts.frama-c.com/dokuwiki/doku.php?id=mantis:frama-c:bug_reporting_guidelines
diff --git a/tests/misc/oracle/plugin-log-all.txt b/tests/misc/oracle/plugin-log-all.txt
index 1a773b13cb6..2483f6ebcc8 100644
--- a/tests/misc/oracle/plugin-log-all.txt
+++ b/tests/misc/oracle/plugin-log-all.txt
@@ -14,7 +14,7 @@ The full backtrace is:
 
 Frama-C aborted: internal error.
 Please report as 'crash' at http://bts.frama-c.com/.
-Your Frama-C version is 18.0 (Argon).
+Your Frama-C version is 18.0+dev (Argon).
 Note that a version and a backtrace alone often do not contain enough
 information to understand the bug. Guidelines for reporting bugs are at:
 http://bts.frama-c.com/dokuwiki/doku.php?id=mantis:frama-c:bug_reporting_guidelines
-- 
GitLab