This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit c1b90ef2c0dc9c0683cdd05648f72be42fbc8427 Merge: c568873 6edeb52 Author: David Cossé <cosse@codelutin.com> Date: Fri Sep 23 16:18:07 2016 +0200 Merge branch 'feature/1369-demarage-initial' into develop .../org/chorem/lima/enums/EntryBooksChartEnum.java | 25 ++++++-- .../lima/ui/entrybook/EntryBookImportForm.css | 22 ++++--- .../lima/ui/entrybook/EntryBookImportForm.jaxx | 14 ++++- .../lima/ui/entrybook/EntryBookViewHandler.java | 19 +++++- .../lima/ui/opening/CreateEntryBookPanel.css | 16 ++++- .../lima/ui/opening/CreateEntryBookPanel.jaxx | 20 ++++++- .../chorem/lima/ui/opening/OpeningViewHandler.java | 41 ++++++++++--- .../resources/i18n/lima-swing_en_GB.properties | 64 ++------------------ .../resources/i18n/lima-swing_fr_FR.properties | 66 +++------------------ src/site/resources/screens/lima_open_entrybook.png | Bin 21208 -> 26349 bytes src/site/rst/assistant.rst | 3 +- src/site/rst/importexport.rst | 20 ++++++- 12 files changed, 159 insertions(+), 151 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.