From 38a4b7f6b217784f4c3f623f3d64ef6b10de176b Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Tue, 9 Jun 2015 10:40:11 +0400
Subject: [PATCH] Init changelog & version 1.18.0

---
 CHANGES.txt | 5 +++++
 VERSION.txt | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.txt b/CHANGES.txt
index df1e151..9286e4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 1.18.0 du 09/06/2015-10:40
+
+01e2929 Intégration de la branche fix-javaproperties
+b24e9ff norm_properties() affiche les caractères en majuscule, comme JavaProperties#store()
+
 ## Version 1.17.0 du 07/06/2015-14:00
 
 e2d0c0c Intégration de la branche pdev-fix
diff --git a/VERSION.txt b/VERSION.txt
index 092afa1..84cc529 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.17.0
+1.18.0