From 0238a99c67e76f5c9714c61f4c50e79889494caf Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 27 Apr 2015 18:12:53 +0400
Subject: [PATCH 1/2] Init changelog & version 1.4.0

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

diff --git a/CHANGES.txt b/CHANGES.txt
index f06196d..7d78e97 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,3 +1,8 @@
+## Version 1.4.0 du 27/04/2015-18:12
+
+7122fc4 Intégration de la branche norm-properties
+845c54e ajout de la fonction norm_properties
+
 ## Version 1.3.0 du 24/04/2015-12:32
 
 bdc6e9b Intégration de la branche localhost
diff --git a/VERSION.txt b/VERSION.txt
index f0bb29e..88c5fb8 100644
--- a/VERSION.txt
+++ b/VERSION.txt
@@ -1 +1 @@
-1.3.0
+1.4.0

From cef5bab0af645003e1fe5d83a135c267b020282c Mon Sep 17 00:00:00 2001
From: Jephte CLAIN <Jephte.Clain@univ-reunion.fr>
Date: Mon, 27 Apr 2015 18:13:02 +0400
Subject: [PATCH 2/2] 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 f23e110..67bbcbe 100644
--- a/lib/ulib/.ulibver
+++ b/lib/ulib/.ulibver
@@ -1 +1 @@
-008003000
+008004000