– Changements dans le script-generateur. Maintenant il sait créer un répertoire pour .XML
– Doc pour générateur
docgen
Doc de generateur ajouté
merging risky
Merge de la doc
doc and uml update
debug
File output works !

Conflicts:
	IGOsim/src/BatteryModule/BatteryPhysics.cpp
	IGOsim/src/Core/File.cpp
	IGOsim/src/Core/HCIs.cpp
	IGOsim/src/Core/HCIs.h
Shorter link to doc with redirection
To UTF8 and beyond !

Conflicts:
	IGOsim/src/Core/File.h
To UTF8 and beyond again !

Conflicts:
	IGOsim/doc/html/BatteryController_8h_source.html
	IGOsim/doc/html/BatteryModule_8h_source.html
	IGOsim/doc/html/BatteryPhysics_8h_source.html
	IGOsim/doc/html/Battery_8h_source.html
	IGOsim/doc/html/CLI_8h_source.html
	IGOsim/doc/html/Connexion_8h_source.html
	IGOsim/doc/html/File_8h_source.html
	IGOsim/doc/html/FloatMessage_8h_source.html
	IGOsim/doc/html/HCI_8h_source.html
	IGOsim/doc/html/HCIs_8h_source.html
	IGOsim/doc/html/ISynchronized_8h_source.html
	IGOsim/doc/html/IntMessage_8h_source.html
	IGOsim/doc/html/MacroModule_8h_source.html
	IGOsim/doc/html/Memory_8h_source.html
	IGOsim/doc/html/Message_8h_source.html
	IGOsim/doc/html/Module_8h_source.html
	IGOsim/doc/html/Physics_8h_source.html
	IGOsim/doc/html/Socket_8h_source.html
	IGOsim/doc/html/StringMessage_8h_source.html
	IGOsim/doc/html/Timer_8h_source.html
	IGOsim/doc/html/XMLReader_8h_source.html
	IGOsim/doc/html/annotated.html
	IGOsim/doc/html/classBattery-members.html
	IGOsim/doc/html/classBattery.html
	IGOsim/doc/html/classBatteryController-members.html
	IGOsim/doc/html/classBatteryController.html
	IGOsim/doc/html/classBatteryModule-members.html
	IGOsim/doc/html/classBatteryModule.html
	IGOsim/doc/html/classBatteryPhysics-members.html
	IGOsim/doc/html/classBatteryPhysics.html
	IGOsim/doc/html/classCLI-members.html
	IGOsim/doc/html/classCLI.html
	IGOsim/doc/html/classConnexion-members.html
	IGOsim/doc/html/classConnexion.html
	IGOsim/doc/html/classFile-members.html
	IGOsim/doc/html/classFile.html
	IGOsim/doc/html/classFloatMessage-members.html
	IGOsim/doc/html/classFloatMessage.html
	IGOsim/doc/html/classHCI-members.html
	IGOsim/doc/html/classHCI.html
	IGOsim/doc/html/classHCIs-members.html
	IGOsim/doc/html/classHCIs.html
	IGOsim/doc/html/classISynchronized-members.html
	IGOsim/doc/html/classISynchronized.html
	IGOsim/doc/html/classIntMessage-members.html
	IGOsim/doc/html/classIntMessage.html
	IGOsim/doc/html/classMacroModule-members.html
	IGOsim/doc/html/classMacroModule.html
	IGOsim/doc/html/classMemory-members.html
	IGOsim/doc/html/classMemory.html
	IGOsim/doc/html/classMessage-members.html
	IGOsim/doc/html/classMessage.html
	IGOsim/doc/html/classModule-members.html
	IGOsim/doc/html/classModule.html
	IGOsim/doc/html/classPhysics-members.html
	IGOsim/doc/html/classPhysics.html
	IGOsim/doc/html/classSocket-members.html
	IGOsim/doc/html/classSocket.html
	IGOsim/doc/html/classStringMessage-members.html
	IGOsim/doc/html/classStringMessage.html
	IGOsim/doc/html/classTimer-members.html
	IGOsim/doc/html/classTimer.html
	IGOsim/doc/html/classXMLReader-members.html
	IGOsim/doc/html/classXMLReader.html
	IGOsim/doc/html/classes.html
	IGOsim/doc/html/dir_68267d1309a1af8e8297ef4c3efbcdba.html
	IGOsim/doc/html/dir_7191c1d8550fc166f1fc71e3683e4257.html
	IGOsim/doc/html/dir_90b4cf55dedf4042d56fdc1807462dc2.html
	IGOsim/doc/html/dir_a2f0e5642e47e7ed59fe0f0829eafb5f.html
	IGOsim/doc/html/docMacroModule.html
	IGOsim/doc/html/docModule.html
	IGOsim/doc/html/files.html
	IGOsim/doc/html/functions.html
	IGOsim/doc/html/functions_enum.html
	IGOsim/doc/html/functions_eval.html
	IGOsim/doc/html/functions_func.html
	IGOsim/doc/html/functions_vars.html
	IGOsim/doc/html/hierarchy.html
	IGOsim/doc/html/index.html
	IGOsim/doc/html/pages.html
	IGOsim/doc/html/todo.html
	IGOsim/doc/html/xmlRef.html
	IGOsim/doc/latex/annotated.tex
	IGOsim/doc/latex/classBattery.pdf
	IGOsim/doc/latex/classBatteryController.pdf
	IGOsim/doc/latex/classBatteryModule.pdf
	IGOsim/doc/latex/classBatteryPhysics.pdf
	IGOsim/doc/latex/classCLI.pdf
	IGOsim/doc/latex/classFile.pdf
	IGOsim/doc/latex/classFile.tex
	IGOsim/doc/latex/classFloatMessage.pdf
	IGOsim/doc/latex/classHCI.pdf
	IGOsim/doc/latex/classHCIs.tex
	IGOsim/doc/latex/classISynchronized.pdf
	IGOsim/doc/latex/classIntMessage.pdf
	IGOsim/doc/latex/classMacroModule.pdf
	IGOsim/doc/latex/classMessage.pdf
	IGOsim/doc/latex/classModule.pdf
	IGOsim/doc/latex/classPhysics.pdf
	IGOsim/doc/latex/classSocket.pdf
	IGOsim/doc/latex/classStringMessage.pdf
	IGOsim/doc/latex/doxygen.sty
	IGOsim/doc/latex/refman.tex
	IGOsim/doc/latex/todo.tex
Bizarre, vous avez dit bizarre ?
Redoc
Updated UML
Adding presentation pdf
Corrections dans generateur de module
Merge branch 'master' of https://github.com/VooDooS/Projet_Simulateur_IGOSAT
Merge remote-tracking branch 'origin/master' into moufida-chariet1
écriture des fichiers .cpp et .h et .xml (mise à jour, corrections avec colin etc…)