This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3bb731353f437369581e9190c748c301d68f8060 Merge: 4a27493 0a57f67 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Oct 7 10:11:05 2015 +0200 Merge branch 'feature/7469-3' into develop .../src/main/java/fr/ird/observe/ObserveOpenDataManager.java | 9 ++++++++- .../main/java/fr/ird/observe/ObserveSwingApplicationContext.java | 4 ++++ .../main/java/fr/ird/observe/ui/tree/ActivityLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/ActivitySeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/DtoNodeSupport.java | 6 +++--- .../java/fr/ird/observe/ui/tree/FloatingObjectSeineNode.java | 1 + .../main/java/fr/ird/observe/ui/tree/ProgramLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/ProgramSeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/RouteSeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/SetLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/SetSeineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/TripLonglineNode.java | 1 + .../src/main/java/fr/ird/observe/ui/tree/TripSeineNode.java | 1 + 13 files changed, 25 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.