merge maj2020

a82f2f70 · VERNIER HARRISON · 25aa4284 · c06e1ac1 · a82f2f70 · a82f2f70
Commit a82f2f70 authored May 13, 2021 by VERNIER HARRISON
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@ local.properties
 .loadpath
 *.hprof
 *.log
+/bin/
--- a/Install Guide MultIcube.pdf
+++ b/Install Guide MultIcube.pdf
--- a/Labels.png
+++ b/Labels.png
--- a/LabelsRandomColors.png
+++ b/LabelsRandomColors.png
--- a/LabelsRandomColors_81.png
+++ b/LabelsRandomColors_81.png
--- a/Labels_81.png
+++ b/Labels_81.png
--- a/README
+++ b/README
+This software have been developped by SDC team from iCube Laboratory.
+
+For installation refer to the "Install Guide MultiCube.pdf"
--- a/README.md
+++ b/README.md
@@ -39,11 +39,19 @@ Note that all commands are designed to work with unix bash.
        * change the Order of importation of ressources in the Order and Export tab to have
        the two highlighted libraries on top :

+<<<<<<< HEAD
 ![image 1](https://icube-forge.unistra.fr/lafabregue/Mustic/-/wikis/uploads/c243fa6d76b68f5f5b2c32d9186abc39/image1.png)

 * Add gdal external jars to the Mustic project :

 ![image 2](https://icube-forge.unistra.fr/lafabregue/Mustic/-/wikis/uploads/002a0be48017c19cf0baef306a7ce4cc/image2.png)
+=======
+![image 1](doc/img/image1.png)
+
+* Add gdal external jars to the Mustic project :
+
+![image 2](doc/img/image2.png)
+>>>>>>> python_in_JAVA2020

 * Run the mustic project :
 Run > Java Application >

--- a/_81.png
+++ b/_81.png
--- a/configuration.xml
+++ b/configuration.xml
--- a/cursor_icon.png
+++ b/cursor_icon.png
--- a/doc/img/image1.png
+++ b/doc/img/image1.png
--- a/doc/img/image10.png
+++ b/doc/img/image10.png
--- a/doc/img/image11.png
+++ b/doc/img/image11.png
--- a/doc/img/image12.png
+++ b/doc/img/image12.png
--- a/doc/img/image13.png
+++ b/doc/img/image13.png
--- a/doc/img/image14.png
+++ b/doc/img/image14.png
--- a/doc/img/image2.png
+++ b/doc/img/image2.png
--- a/doc/img/image3.png
+++ b/doc/img/image3.png
--- a/doc/img/image5.png
+++ b/doc/img/image5.png