Merge branch 'master' into ia

utcoupe · May 8, 2017 · 61bc525 · 61bc525
2 parents 0064695 + ec9e52d
commit 61bc525
Show file tree

Hide file tree

Showing 39 changed files with 15 additions and 126,455 deletions.
diff --git a/simulateur/afficheur/3d/gobelet.dae b/simulateur/afficheur/3d/gobelet.dae
diff --git a/simulateur/afficheur/3d/pied_jaune.dae b/simulateur/afficheur/3d/pied_jaune.dae
diff --git a/simulateur/afficheur/3d/pied_vert.dae b/simulateur/afficheur/3d/pied_vert.dae
diff --git a/simulateur/afficheur/3d/plateau_mieux.dae b/simulateur/afficheur/3d/plateau_mieux.dae
diff --git a/simulateur/afficheur/3d/plateau_mieux_ancien.dae b/simulateur/afficheur/3d/plateau_mieux_ancien.dae
diff --git a/simulateur/afficheur/afficheur.js b/simulateur/afficheur/afficheur.js
diff --git a/simulateur/afficheur/ampoules_aff.js b/simulateur/afficheur/ampoules_aff.js
diff --git a/simulateur/afficheur/clapets_aff.js b/simulateur/afficheur/clapets_aff.js
diff --git a/simulateur/afficheur/data.json b/simulateur/afficheur/data.json
diff --git a/simulateur/afficheur/distributeurs_aff.js b/simulateur/afficheur/distributeurs_aff.js
diff --git a/simulateur/afficheur/filtre.js b/simulateur/afficheur/filtre.js
diff --git a/simulateur/afficheur/gobelets_aff.js b/simulateur/afficheur/gobelets_aff.js