Integration de Utilisateur
Merge branch 'master' of https://github.com/mouradsaadi/LO23-IHM

Conflicts:
	Suduko-IHM/src/sudoko/ihm/vue/FXMLDocumentController.java
no message
no message
Merge branch 'master' of https://github.com/mouradsaadi/LO23-IHM into marinfel/creerGrille

Conflicts:
	Suduko-IHM/nbproject/project.properties
	Suduko-IHM/src/sudoko/ihm/vue/FXMLDocument.fxml
	Suduko-IHM/src/sudoko/ihm/vue/FXMLDocumentController.java
include Jar file
Passage JDK7
Merge branch 'marinfel/creerGrille' of https://github.com/mouradsaadi/LO23-IHM

Conflicts:
	Suduko-IHM/nbproject/project.properties
	Suduko-IHM/src/sudoko/ihm/vue/FXMLDocumentController.java
Control FX
JDK7 - rebelotte
settings
Merge branch 'master' of https://github.com/mouradsaadi/LO23-IHM into marinfel/creerGrille

Conflicts:
	Suduko-IHM/nbproject/project.properties
	Suduko-IHM/src/sudoko/ihm/vue/FXMLDocumentController.java
Merge pull request #7 from mouradsaadi/marinfel/creerGrille

JDK7 - rebelotte
Merge branch 'master' of https://github.com/mouradsaadi/LO23-IHM
mainframe
Delete all files
Reload the projet, still on Java 8. PS: Jonas could you please resolve it ? :)
Delete all project
Reload julian project
Merge pull request #8 from mouradsaadi/settingup

Settingup