modified:   src/c/ControleurPrincipal.java
	modified:   src/c/ControleurVueDessin.java
	modified:   src/c/Test.java
	modified:   src/v_vues/Vue_Dessin.java
Ces fichiers n'ont rien à voir avec le code :
	deleted:    src/DCControleur.java
	deleted:    src/DCMetier.java
Ajout du fichier contrôleur du Compteur (Thread)
	new file:   src/c/ControleurCompteurAnimation.java
Merge branch 'master' into animation

Conflicts:
	src/c/ControleurVueDessin.java
	src/c/Test.java

	new file:   doc/allclasses-frame.html
	new file:   doc/allclasses-noframe.html
	new file:   doc/c/ControleurPrincipal.html
	new file:   doc/c/ControleurVueDessin.html
	new file:   doc/c/ControleurVueEdition.html
	new file:   doc/c/ControleurVueFenetre.html
	new file:   doc/c/ControleurVueJoueurs.html
	new file:   doc/c/ControleurVueLecture.html
	new file:   doc/c/ControleurVueTerrain.html
	new file:   doc/c/Parametres.html
	new file:   doc/c/Test.html
	new file:   doc/c/Xml.html
	new file:   doc/c/class-use/ControleurPrincipal.html
	new file:   doc/c/class-use/ControleurVueDessin.html
	new file:   doc/c/class-use/ControleurVueEdition.html
	new file:   doc/c/class-use/ControleurVueFenetre.html
	new file:   doc/c/class-use/ControleurVueJoueurs.html
	new file:   doc/c/class-use/ControleurVueLecture.html
	new file:   doc/c/class-use/ControleurVueTerrain.html
	new file:   doc/c/class-use/Parametres.html
	new file:   doc/c/class-use/Test.html
	new file:   doc/c/class-use/Xml.html
	new file:   doc/c/package-frame.html
	new file:   doc/c/package-summary.html
	new file:   doc/c/package-tree.html
	new file:   doc/c/package-use.html
	new file:   doc/constant-values.html
	new file:   doc/deprecated-list.html
	new file:   doc/help-doc.html
	new file:   doc/index-files/index-1.html
	new file:   doc/index-files/index-10.html
	new file:   doc/index-files/index-11.html
	new file:   doc/index-files/index-12.html
	new file:   doc/index-files/index-13.html
	new file:   doc/index-files/index-14.html
	new file:   doc/index-files/index-15.html
	new file:   doc/index-files/index-16.html
	new file:   doc/index-files/index-17.html
	new file:   doc/index-files/index-18.html
	new file:   doc/index-files/index-19.html
	new file:   doc/index-files/index-2.html
	new file:   doc/index-files/index-20.html
	new file:   doc/index-files/index-3.html
	new file:   doc/index-files/index-4.html
	new file:   doc/index-files/index-5.html
	new file:   doc/index-files/index-6.html
	new file:   doc/index-files/index-7.html
	new file:   doc/index-files/index-8.html
	new file:   doc/index-files/index-9.html
	new file:   doc/index.html
	new file:   doc/m/Element.html
	new file:   doc/m/Equipe.html
	new file:   doc/m/GestionDesSauvegardeDeStrategie.html
	new file:   doc/m/Joueur.html
	new file:   doc/m/Orientation.html
	new file:   doc/m/Position.html
	new file:   doc/m/Strategie.html
	new file:   doc/m/StyleQ.html
	new file:   doc/m/TypeElt.html
	new file:   doc/m/TypeStrategie.html
	new file:   doc/m/class-use/Element.html
	new file:   doc/m/class-use/Equipe.html
	new file:   doc/m/class-use/GestionDesSauvegardeDeStrategie.html
	new file:   doc/m/class-use/Joueur.html
	new file:   doc/m/class-use/Orientation.html
	new file:   doc/m/class-use/Position.html
	new file:   doc/m/class-use/Strategie.html
	new file:   doc/m/class-use/StyleQ.html
	new file:   doc/m/class-use/TypeElt.html
	new file:   doc/m/class-use/TypeStrategie.html
	new file:   doc/m/package-frame.html
	new file:   doc/m/package-summary.html
	new file:   doc/m/package-tree.html
	new file:   doc/m/package-use.html
	new file:   doc/overview-frame.html
	new file:   doc/overview-summary.html
	new file:   doc/overview-tree.html
	new file:   doc/package-list
	new file:   doc/resources/inherit.gif
	new file:   doc/serialized-form.html
	new file:   doc/stylesheet.css
	new file:   doc/v_ecouteurs/AL_Edition.html
	new file:   doc/v_ecouteurs/AL_Fenetre.html
	new file:   doc/v_ecouteurs/AL_Joueurs.html
	new file:   doc/v_ecouteurs/AL_Lecture.html
	new file:   doc/v_ecouteurs/CL_Fenetre.html
	new file:   doc/v_ecouteurs/class-use/AL_Edition.html
	new file:   doc/v_ecouteurs/class-use/AL_Fenetre.html
	new file:   doc/v_ecouteurs/class-use/AL_Joueurs.html
	new file:   doc/v_ecouteurs/class-use/AL_Lecture.html
	new file:   doc/v_ecouteurs/class-use/CL_Fenetre.html
	new file:   doc/v_ecouteurs/package-frame.html
	new file:   doc/v_ecouteurs/package-summary.html
	new file:   doc/v_ecouteurs/package-tree.html
	new file:   doc/v_ecouteurs/package-use.html
	new file:   doc/v_utilitaires/BoutonPositionner.html
	new file:   doc/v_utilitaires/SaisieDeplacement.html
	new file:   doc/v_utilitaires/SaisieDeplacementAvecOrientation.html
	new file:   doc/v_utilitaires/SaisieJoueur.html
	new file:   doc/v_utilitaires/SelectionEquipe.html
	new file:   doc/v_utilitaires/SelectionTemps.html
	new file:   doc/v_utilitaires/class-use/BoutonPositionner.html
	new file:   doc/v_utilitaires/class-use/SaisieDeplacement.html
	new file:   doc/v_utilitaires/class-use/SaisieDeplacementAvecOrientation.html
	new file:   doc/v_utilitaires/class-use/SaisieJoueur.html
	new file:   doc/v_utilitaires/class-use/SelectionEquipe.html
	new file:   doc/v_utilitaires/class-use/SelectionTemps.html
	new file:   doc/v_utilitaires/package-frame.html
	new file:   doc/v_utilitaires/package-summary.html
	new file:   doc/v_utilitaires/package-tree.html
	new file:   doc/v_utilitaires/package-use.html
	new file:   doc/v_vues/Vue_APropos.html
	new file:   doc/v_vues/Vue_Aide.html
	new file:   doc/v_vues/Vue_Dessin.html
	new file:   doc/v_vues/Vue_Edition.html
	new file:   doc/v_vues/Vue_Fenetre.html
	new file:   doc/v_vues/Vue_Joueurs.html
	new file:   doc/v_vues/Vue_Lecture.html
	new file:   doc/v_vues/Vue_PCouleurs.html
	new file:   doc/v_vues/Vue_PGrille.html
	new file:   doc/v_vues/Vue_Params.html
	new file:   doc/v_vues/Vue_Terrain.html
	new file:   doc/v_vues/class-use/Vue_APropos.html
	new file:   doc/v_vues/class-use/Vue_Aide.html
	new file:   doc/v_vues/class-use/Vue_Dessin.html
	new file:   doc/v_vues/class-use/Vue_Edition.html
	new file:   doc/v_vues/class-use/Vue_Fenetre.html
	new file:   doc/v_vues/class-use/Vue_Joueurs.html
	new file:   doc/v_vues/class-use/Vue_Lecture.html
	new file:   doc/v_vues/class-use/Vue_PCouleurs.html
	new file:   doc/v_vues/class-use/Vue_PGrille.html
	new file:   doc/v_vues/class-use/Vue_Params.html
	new file:   doc/v_vues/class-use/Vue_Terrain.html
	new file:   doc/v_vues/package-frame.html
	new file:   doc/v_vues/package-summary.html
	new file:   doc/v_vues/package-tree.html
	new file:   doc/v_vues/package-use.html
	modified:   src/c/ControleurVueDessin.java
	modified:   src/c/ControleurVueEdition.java
	modified:   src/c/ControleurVueFenetre.java
	modified:   src/c/ControleurVueJoueurs.java
	modified:   src/c/ControleurVueLecture.java
	modified:   src/c/ControleurVueTerrain.java
	modified:   src/c/Parametres.java
	modified:   src/c/Test.java
	modified:   src/c/Xml.java
	modified:   src/m/Element.java
	modified:   src/m/GestionDesSauvegardeDeStrategie.java
	modified:   src/m/Joueur.java
	modified:   src/m/Position.java
	modified:   src/v_ecouteurs/AL_Edition.java
	modified:   src/v_ecouteurs/AL_Joueurs.java
	modified:   src/v_utilitaires/BoutonPositionner.java
	modified:   src/v_utilitaires/SaisieDeplacement.java
	modified:   src/v_utilitaires/SaisieDeplacementAvecOrientation.java
	modified:   src/v_utilitaires/SaisieJoueur.java
	modified:   src/v_utilitaires/SelectionEquipe.java
	modified:   src/v_utilitaires/SelectionTemps.java
	modified:   src/v_vues/Vue_APropos.java
	modified:   src/v_vues/Vue_Aide.java
	modified:   src/v_vues/Vue_Dessin.java
	modified:   src/v_vues/Vue_Edition.java
	modified:   src/v_vues/Vue_Fenetre.java
	modified:   src/v_vues/Vue_Joueurs.java
	modified:   src/v_vues/Vue_Lecture.java
	modified:   src/v_vues/Vue_PCouleurs.java
	modified:   src/v_vues/Vue_PGrille.java
	modified:   src/v_vues/Vue_Params.java
	modified:   src/v_vues/Vue_Terrain.java
Ajout des "classes" pour l'animation.

	new file:   src/c/ControleurVueAnimation.java
	new file:   src/v_ecouteurs/AL_Animation.java
	new file:   src/v_vues/Vue_StratFrameByFrame.java
Suppression des erreurs pour avoir une version "propre" en commit.

	modified:   src/c/ControleurCompteurAnimation.java
Merge branch 'master' into animation
Ajout de classes "extend copié collé modifié" pour essayer de faire l'animation.
	renamed:    src/c/ControleurCompteurAnimation.java -> src/c/CompteurAnimation.java
	modified:   src/c/ControleurPrincipal.java
	modified:   src/c/ControleurVueDessin.java
	new file:   src/c/ControleurVueDessinAnimation.java
	renamed:    src/c/ControleurVueAnimation.java -> src/c/ControleurVueTerrainAnimation.java
	modified:   src/c/Test.java
	modified:   src/v_ecouteurs/AL_Animation.java
	modified:   src/v_ecouteurs/AL_Lecture.java
	new file:   src/v_vues/Vue_DessinAnimation.java
	modified:   src/v_vues/Vue_Lecture.java
	modified:   src/v_vues/Vue_StratFrameByFrame.java
	new file:   src/v_vues/Vue_TerrainAnimation.java
Gros commit avancement dans la partie Animation (affichage d'une fenêtre avec le terrain mais erreur si pas de stratégie)
	modified:   src/c/CompteurAnimation.java
	modified:   src/c/ControleurPrincipal.java
	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_ecouteurs/AL_Animation.java
	modified:   src/v_ecouteurs/AL_Lecture.java
	modified:   src/v_vues/Vue_Lecture.java
	modified:   src/v_vues/Vue_TerrainAnimation.java
Juste un //TODO en plus, ça me donne l'impression d'avancer de faire des commits
modified:   src/v_vues/Vue_StratFrameByFrame.java
Fenêtre de l'animation créée avec un bouton pour switcher le mode de terrain.

	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_ecouteurs/AL_Animation.java
	new file:   src/v_vues/Vue_ConsoleAnimation.java
	deleted:    src/v_vues/Vue_StratFrameByFrame.java
	modified:   src/v_vues/Vue_TerrainAnimation.java
Avancement de l'animation (working on Thread and Animation).
	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_ecouteurs/AL_Animation.java
Oublié d'enregistrer
	modified:   src/c/CompteurAnimation.java
Merge branch 'master' into animation
Avancement animation.

	modified:   src/c/CompteurAnimation.java
	modified:   src/c/ControleurPrincipal.java
	modified:   src/c/ControleurVueDessinAnimation.java
	modified:   src/c/ControleurVueFenetre.java
	modified:   src/c/ControleurVueLecture.java
	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_ecouteurs/AL_Animation.java
	modified:   src/v_ecouteurs/AL_Edition.java
	modified:   src/v_vues/Vue_ConsoleAnimation.java
	modified:   src/v_vues/Vue_DessinAnimation.java
	modified:   src/v_vues/Vue_Edition.java
	modified:   src/v_vues/Vue_Lecture.java
	modified:   src/v_vues/Vue_TerrainAnimation.java
Avancement animation > Prémerge.

	modified:   src/c/CompteurAnimation.java
	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_vues/Vue_Edition.java
	modified:   src/v_vues/Vue_TerrainAnimation.java
Merge branch 'master' into animation

Conflicts:
	src/c/ControleurVueLecture.java

	modified:   src/c/ControleurVueLecture.java
	modified:   src/v_ecouteurs/AL_Lecture.java
	modified:   src/v_vues/Vue_Fenetre.java
	modified:   src/c/CompteurAnimation.java
	modified:   src/c/ControleurVueDessinAnimation.java
	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_ecouteurs/AL_Animation.java
	modified:   src/v_vues/Vue_DessinAnimation.java
Bug d'affichage en terrain complet
Boutons fonctionnels (play pause stop).
	modified:   src/c/CompteurAnimation.java
	modified:   src/c/ControleurVueTerrainAnimation.java
	modified:   src/v_ecouteurs/AL_Animation.java
	modified:   src/v_vues/Vue_ConsoleAnimation.java
	modified:   src/v_vues/Vue_DessinAnimation.java