Version dernière ligne droite
Merge branch 'master' of https://github.com/KacemRostom/Tp_IGL

Conflicts:
build/built-jar.properties
build/classes/igl_tp1_si/mohammed_boukraa/Administrateur.class
build/classes/igl_tp1_si/mohammed_boukraa/Bibliotheque.class
build/nb-jfx.jks
dist/IGL_Tp1_Si-Mohammed_Boukraa.html
dist/IGL_Tp1_Si-Mohammed_Boukraa.jar
dist/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
dist/run1516078657/IGL_Tp1_Si-Mohammed_Boukraa.jar
dist/run1516078657/web-files/dtjava.js
dist/run1516078657/web-files/error.png
dist/run1516078657/web-files/get_java.png
dist/run1516078657/web-files/get_javafx.png
dist/run1516078657/web-files/javafx-chrome.png
dist/run1516078657/web-files/javafx-loading-100x100.gif
dist/run1516078657/web-files/javafx-loading-25x25.gif
dist/run1516078657/web-files/upgrade_java.png
dist/run1516078657/web-files/upgrade_javafx.png
dist/run160762638/IGL_Tp1_Si-Mohammed_Boukraa.jar
dist/run160762638/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
dist/run160762638/web-files/dtjava.js
dist/run160762638/web-files/error.png
dist/run160762638/web-files/get_java.png
dist/run160762638/web-files/get_javafx.png
dist/run160762638/web-files/javafx-chrome.png
dist/run160762638/web-files/javafx-loading-100x100.gif
dist/run160762638/web-files/javafx-loading-25x25.gif
dist/run160762638/web-files/upgrade_java.png
dist/run160762638/web-files/upgrade_javafx.png
dist/run1804348145/IGL_Tp1_Si-Mohammed_Boukraa.html
dist/run1804348145/IGL_Tp1_Si-Mohammed_Boukraa.jar
dist/run1804348145/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
dist/run1804348145/web-files/dtjava.js
dist/run1804348145/web-files/error.png
dist/run1804348145/web-files/get_java.png
dist/run1804348145/web-files/get_javafx.png
dist/run1804348145/web-files/javafx-chrome.png
dist/run1804348145/web-files/javafx-loading-100x100.gif
dist/run1804348145/web-files/javafx-loading-25x25.gif
dist/run1804348145/web-files/upgrade_java.png
dist/run1804348145/web-files/upgrade_javafx.png
dist/run2079202115/IGL_Tp1_Si-Mohammed_Boukraa.jar
dist/run2079202115/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
dist/run2079202115/web-files/dtjava.js
dist/run2079202115/web-files/error.png
dist/run2079202115/web-files/get_java.png
dist/run2079202115/web-files/get_javafx.png
dist/run2079202115/web-files/javafx-chrome.png
dist/run2079202115/web-files/javafx-loading-100x100.gif
dist/run2079202115/web-files/javafx-loading-25x25.gif
dist/run2079202115/web-files/upgrade_java.png
dist/run2079202115/web-files/upgrade_javafx.png
dist/run537201076/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
src/igl_tp1_si/mohammed_boukraa/Administrateur.java
src/igl_tp1_si/mohammed_boukraa/Bibliotheque.java
Ok
Merge branch 'master' of https://github.com/KacemRostom/Tp_IGL

Conflicts:
	build/built-jar.properties
	build/classes/igl_tp1_si/mohammed_boukraa/Administrateur.class
	build/classes/igl_tp1_si/mohammed_boukraa/Bibliotheque.class
	build/nb-jfx.jks
	dist/IGL_Tp1_Si-Mohammed_Boukraa.html
	dist/IGL_Tp1_Si-Mohammed_Boukraa.jar
	dist/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
	dist/run1516078657/IGL_Tp1_Si-Mohammed_Boukraa.jar
	dist/run1516078657/web-files/dtjava.js
	dist/run1516078657/web-files/error.png
	dist/run1516078657/web-files/get_java.png
	dist/run1516078657/web-files/get_javafx.png
	dist/run1516078657/web-files/javafx-chrome.png
	dist/run1516078657/web-files/javafx-loading-100x100.gif
	dist/run1516078657/web-files/javafx-loading-25x25.gif
	dist/run1516078657/web-files/upgrade_java.png
	dist/run1516078657/web-files/upgrade_javafx.png
	dist/run160762638/IGL_Tp1_Si-Mohammed_Boukraa.jar
	dist/run160762638/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
	dist/run160762638/web-files/dtjava.js
	dist/run160762638/web-files/error.png
	dist/run160762638/web-files/get_java.png
	dist/run160762638/web-files/get_javafx.png
	dist/run160762638/web-files/javafx-chrome.png
	dist/run160762638/web-files/javafx-loading-100x100.gif
	dist/run160762638/web-files/javafx-loading-25x25.gif
	dist/run160762638/web-files/upgrade_java.png
	dist/run160762638/web-files/upgrade_javafx.png
	dist/run1804348145/IGL_Tp1_Si-Mohammed_Boukraa.html
	dist/run1804348145/IGL_Tp1_Si-Mohammed_Boukraa.jar
	dist/run1804348145/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
	dist/run1804348145/web-files/dtjava.js
	dist/run1804348145/web-files/error.png
	dist/run1804348145/web-files/get_java.png
	dist/run1804348145/web-files/get_javafx.png
	dist/run1804348145/web-files/javafx-chrome.png
	dist/run1804348145/web-files/javafx-loading-100x100.gif
	dist/run1804348145/web-files/javafx-loading-25x25.gif
	dist/run1804348145/web-files/upgrade_java.png
	dist/run1804348145/web-files/upgrade_javafx.png
	dist/run2079202115/IGL_Tp1_Si-Mohammed_Boukraa.jar
	dist/run2079202115/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
	dist/run2079202115/web-files/dtjava.js
	dist/run2079202115/web-files/error.png
	dist/run2079202115/web-files/get_java.png
	dist/run2079202115/web-files/get_javafx.png
	dist/run2079202115/web-files/javafx-chrome.png
	dist/run2079202115/web-files/javafx-loading-100x100.gif
	dist/run2079202115/web-files/javafx-loading-25x25.gif
	dist/run2079202115/web-files/upgrade_java.png
	dist/run2079202115/web-files/upgrade_javafx.png
	dist/run537201076/IGL_Tp1_Si-Mohammed_Boukraa.jnlp
	src/igl_tp1_si/mohammed_boukraa/Administrateur.java
	src/igl_tp1_si/mohammed_boukraa/Bibliotheque.java