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 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 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]*$' |