From 48ca720ff8c86a0dab5ada58b80ac6bf72d22d1c Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 4 May 2015 12:38:58 +0400
Subject: [PATCH 1/3] =?UTF-8?q?ajout=20de=20l'en-t=C3=AAte?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/ulib/javaproperties | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/ulib/javaproperties b/lib/ulib/javaproperties
index f6fc325..5cb45be 100644
--- a/lib/ulib/javaproperties
+++ b/lib/ulib/javaproperties
@@ -113,6 +113,7 @@ function write_properties() {
 }
 
 function __norm_properties() {
+    echo '# -*- coding: iso-8859-1 -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=iso-8859-1'
     _nl2lf |
     grep -v $'^[ \t]*#' |
     grep -v $'^[ \t]*$' |

From 5d9db9331a81e19e4bd965210ee33f80896c69db Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 4 May 2015 12:40:40 +0400
Subject: [PATCH 2/3] Init changelog & version 1.6.0

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

diff --git a/CHANGES.txt b/CHANGES.txt
index 0ec3d44..676a001 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 1.6.0 du 04/05/2015-12:40
+
+0463b2c Intégration de la branche norm_props
+48ca720 ajout de l'en-tête
+
 ## Version 1.5.1 du 29/04/2015-10:14
 
 4c92f54 Intégration de la branche push-all
diff --git a/VERSION.txt b/VERSION.txt
index 26ca594..dc1e644 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.5.1
+1.6.0

From e23934a43f898fe7c3fc8f68a59bdc7a3ff0f08b Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 4 May 2015 12:41:02 +0400
Subject: [PATCH 3/3] maj de ulib

---
 lib/ulib/.ulibver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/ulib/.ulibver b/lib/ulib/.ulibver
index 7015894..3c8e806 100644
--- a/lib/ulib/.ulibver
+++ b/lib/ulib/.ulibver
@@ -1 +1 @@
-008005000
+008006000