From: Benjamin A. <Ba...@us...> - 2011-04-18 23:49:14
|
This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "krobot". The branch, master has been updated via 3c5104a9beb21ba05f513b15c7798075364ca875 (commit) via f22dafb3f0864a8b1e53343db7019337181676ca (commit) via b1cc4511212b197108a39fe2fe35f73c7b992e05 (commit) from 9b656fa3148ddfc5179e956ab19b4c0bba7f03c7 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 3c5104a9beb21ba05f513b15c7798075364ca875 Merge: f22dafb3f0864a8b1e53343db7019337181676ca 9b656fa3148ddfc5179e956ab19b4c0bba7f03c7 Author: Benjamin Aupetit <au...@cr...> Date: Tue Apr 19 01:48:46 2011 +0200 Merge branch 'master' of ssh://krobot.git.sourceforge.net/gitroot/krobot/krobot commit f22dafb3f0864a8b1e53343db7019337181676ca Author: Benjamin Aupetit <au...@cr...> Date: Tue Apr 19 01:47:45 2011 +0200 [meca] Solving some bugs commit b1cc4511212b197108a39fe2fe35f73c7b992e05 Author: Benjamin Aupetit <au...@cr...> Date: Tue Apr 19 01:46:54 2011 +0200 [meca] Adding drawing for HPC ----------------------------------------------------------------------- Changes: diff --git a/meca/2011_Senior/SupportMiroir/Mat_Balise.CATProduct b/meca/2011_Senior/SupportMiroir/Mat_Balise.CATProduct index 4cdce1b..25a9e4c 100644 Binary files a/meca/2011_Senior/SupportMiroir/Mat_Balise.CATProduct and b/meca/2011_Senior/SupportMiroir/Mat_Balise.CATProduct differ diff --git a/meca/2011_Senior/ascenceurs/Ascenseur_axe_glissiere.CATPart b/meca/2011_Senior/ascenceurs/Ascenseur_axe_glissiere.CATPart index f96e239..7b62622 100644 Binary files a/meca/2011_Senior/ascenceurs/Ascenseur_axe_glissiere.CATPart and b/meca/2011_Senior/ascenceurs/Ascenseur_axe_glissiere.CATPart differ diff --git a/meca/2011_Senior/ascenceurs/Ascenseur_plaque.CATPart b/meca/2011_Senior/ascenceurs/Ascenseur_plaque.CATPart index a6e43cb..ad3c63a 100644 Binary files a/meca/2011_Senior/ascenceurs/Ascenseur_plaque.CATPart and b/meca/2011_Senior/ascenceurs/Ascenseur_plaque.CATPart differ diff --git a/meca/2011_Senior/ascenceurs/Poulie_bas_avec_support.CATProduct b/meca/2011_Senior/ascenceurs/Poulie_bas_avec_support.CATProduct index 7853e4b..c9b82fc 100644 Binary files a/meca/2011_Senior/ascenceurs/Poulie_bas_avec_support.CATProduct and b/meca/2011_Senior/ascenceurs/Poulie_bas_avec_support.CATProduct differ diff --git a/meca/2011_Senior/ascenceurs/ascenseur.CATProduct b/meca/2011_Senior/ascenceurs/ascenseur.CATProduct index 33002aa..2edafc5 100644 Binary files a/meca/2011_Senior/ascenceurs/ascenseur.CATProduct and b/meca/2011_Senior/ascenceurs/ascenseur.CATProduct differ diff --git a/meca/2011_Senior/ascenceurs/serre-courroie.CATPart b/meca/2011_Senior/ascenceurs/serre-courroie.CATPart index 023b5ff..14d6826 100644 Binary files a/meca/2011_Senior/ascenceurs/serre-courroie.CATPart and b/meca/2011_Senior/ascenceurs/serre-courroie.CATPart differ diff --git a/meca/2011_Senior/bati/base.CATPart b/meca/2011_Senior/bati/base.CATPart index e22452c..72651a5 100644 Binary files a/meca/2011_Senior/bati/base.CATPart and b/meca/2011_Senior/bati/base.CATPart differ diff --git a/meca/2011_Senior/bati/plaque2.CATPart b/meca/2011_Senior/bati/plaque2.CATPart index 6baa75b..d67e6ec 100644 Binary files a/meca/2011_Senior/bati/plaque2.CATPart and b/meca/2011_Senior/bati/plaque2.CATPart differ diff --git a/meca/2011_Senior/bati/plaque3.CATPart b/meca/2011_Senior/bati/plaque3.CATPart index 9917255..5750f9c 100644 Binary files a/meca/2011_Senior/bati/plaque3.CATPart and b/meca/2011_Senior/bati/plaque3.CATPart differ diff --git a/meca/2011_Senior/bati/plaque4.CATPart b/meca/2011_Senior/bati/plaque4.CATPart index e38d358..ae720aa 100644 Binary files a/meca/2011_Senior/bati/plaque4.CATPart and b/meca/2011_Senior/bati/plaque4.CATPart differ diff --git a/meca/2011_Senior/bati/plaque5.CATPart b/meca/2011_Senior/bati/plaque5.CATPart index d3620ce..7710d0f 100644 Binary files a/meca/2011_Senior/bati/plaque5.CATPart and b/meca/2011_Senior/bati/plaque5.CATPart differ diff --git a/meca/2011_Senior/cartes/cartes.CATProduct b/meca/2011_Senior/cartes/cartes.CATProduct index 5b125e3..146063b 100644 Binary files a/meca/2011_Senior/cartes/cartes.CATProduct and b/meca/2011_Senior/cartes/cartes.CATProduct differ diff --git a/meca/2011_Senior/cartes/entretoises-carte.CATProduct b/meca/2011_Senior/cartes/entretoises-carte.CATProduct index 0db4f8a..1f29607 100644 Binary files a/meca/2011_Senior/cartes/entretoises-carte.CATProduct and b/meca/2011_Senior/cartes/entretoises-carte.CATProduct differ diff --git a/meca/2011_Senior/cartes/entretoises-cartes.CATProduct b/meca/2011_Senior/cartes/entretoises-cartes.CATProduct index 3a216eb..3f7a070 100644 Binary files a/meca/2011_Senior/cartes/entretoises-cartes.CATProduct and b/meca/2011_Senior/cartes/entretoises-cartes.CATProduct differ diff --git a/meca/2011_Senior/divers/webcam.CATProduct b/meca/2011_Senior/divers/webcam.CATProduct index 7d17615..771557b 100644 Binary files a/meca/2011_Senior/divers/webcam.CATProduct and b/meca/2011_Senior/divers/webcam.CATProduct differ diff --git a/meca/2011_Senior/etages/Etage_1.CATProduct b/meca/2011_Senior/etages/Etage_1.CATProduct index eaa9147..306bce0 100644 Binary files a/meca/2011_Senior/etages/Etage_1.CATProduct and b/meca/2011_Senior/etages/Etage_1.CATProduct differ diff --git a/meca/2011_Senior/etages/Etage_2.CATProduct b/meca/2011_Senior/etages/Etage_2.CATProduct index c879607..34b13e0 100644 Binary files a/meca/2011_Senior/etages/Etage_2.CATProduct and b/meca/2011_Senior/etages/Etage_2.CATProduct differ diff --git a/meca/2011_Senior/etages/Etage_3.CATProduct b/meca/2011_Senior/etages/Etage_3.CATProduct index cca64c3..a575b11 100644 Binary files a/meca/2011_Senior/etages/Etage_3.CATProduct and b/meca/2011_Senior/etages/Etage_3.CATProduct differ diff --git a/meca/2011_Senior/etages/etage1/axes.CATProduct b/meca/2011_Senior/etages/etage1/axes.CATProduct index 1d017d7..ccae73f 100644 Binary files a/meca/2011_Senior/etages/etage1/axes.CATProduct and b/meca/2011_Senior/etages/etage1/axes.CATProduct differ diff --git a/meca/2011_Senior/pinces/Pince_droite_bas.CATProduct b/meca/2011_Senior/pinces/Pince_droite_bas.CATProduct index f95599f..d982dbb 100644 Binary files a/meca/2011_Senior/pinces/Pince_droite_bas.CATProduct and b/meca/2011_Senior/pinces/Pince_droite_bas.CATProduct differ diff --git a/meca/2011_Senior/pinces/Pince_gauche_bas.CATProduct b/meca/2011_Senior/pinces/Pince_gauche_bas.CATProduct index 16c9bf4..bf33922 100644 Binary files a/meca/2011_Senior/pinces/Pince_gauche_bas.CATProduct and b/meca/2011_Senior/pinces/Pince_gauche_bas.CATProduct differ diff --git a/meca/2011_Senior/robot.CATProduct b/meca/2011_Senior/robot.CATProduct index 45714fd..cf532ee 100644 Binary files a/meca/2011_Senior/robot.CATProduct and b/meca/2011_Senior/robot.CATProduct differ diff --git a/meca/2011_Senior/roues/Assemblage BH102-40-606 et 606ZZ.CATProduct b/meca/2011_Senior/roues/Assemblage BH102-40-606 et 606ZZ.CATProduct index ba6881e..ad4c7ee 100644 Binary files a/meca/2011_Senior/roues/Assemblage BH102-40-606 et 606ZZ.CATProduct and b/meca/2011_Senior/roues/Assemblage BH102-40-606 et 606ZZ.CATProduct differ diff --git a/meca/2011_Senior/roues/Assemblage P20.CATProduct b/meca/2011_Senior/roues/Assemblage P20.CATProduct index 0b60d98..3260c8a 100644 Binary files a/meca/2011_Senior/roues/Assemblage P20.CATProduct and b/meca/2011_Senior/roues/Assemblage P20.CATProduct differ diff --git a/meca/2011_Senior/roues/Assemblage moteur.CATProduct b/meca/2011_Senior/roues/Assemblage moteur.CATProduct index 8db3a08..33bb4e4 100644 Binary files a/meca/2011_Senior/roues/Assemblage moteur.CATProduct and b/meca/2011_Senior/roues/Assemblage moteur.CATProduct differ diff --git a/meca/2011_Senior/roues/Bloc_roue.CATProduct b/meca/2011_Senior/roues/Bloc_roue.CATProduct index 907d985..679bd5e 100644 Binary files a/meca/2011_Senior/roues/Bloc_roue.CATProduct and b/meca/2011_Senior/roues/Bloc_roue.CATProduct differ diff --git a/meca/2011_Senior/roues/GuideCodeur-bloc.CATPart b/meca/2011_Senior/roues/GuideCodeur-bloc.CATPart index af528f0..c73590b 100644 Binary files a/meca/2011_Senior/roues/GuideCodeur-bloc.CATPart and b/meca/2011_Senior/roues/GuideCodeur-bloc.CATPart differ diff --git a/meca/2011_Senior/roues/P20 Arbre.CATPart b/meca/2011_Senior/roues/P20 Arbre.CATPart index dea325b..01e091a 100644 Binary files a/meca/2011_Senior/roues/P20 Arbre.CATPart and b/meca/2011_Senior/roues/P20 Arbre.CATPart differ diff --git a/meca/2011_Senior/roues/Support.CATPart b/meca/2011_Senior/roues/Support.CATPart index f6b6c04..35fec0a 100644 Binary files a/meca/2011_Senior/roues/Support.CATPart and b/meca/2011_Senior/roues/Support.CATPart differ diff --git a/meca/2011_Senior/roues/axe_codeur.CATPart b/meca/2011_Senior/roues/axe_codeur.CATPart index 8d5c28f..e8e27b8 100644 Binary files a/meca/2011_Senior/roues/axe_codeur.CATPart and b/meca/2011_Senior/roues/axe_codeur.CATPart differ diff --git a/meca/2011_Senior/roues/axe_roue.CATPart b/meca/2011_Senior/roues/axe_roue.CATPart index b904dfb..514e1c7 100644 Binary files a/meca/2011_Senior/roues/axe_roue.CATPart and b/meca/2011_Senior/roues/axe_roue.CATPart differ diff --git a/meca/2011_Senior/usinage/Axe-Ascenseur.pdf b/meca/2011_Senior/usinage/Axe-Ascenseur.pdf new file mode 100644 index 0000000..dec5308 Binary files /dev/null and b/meca/2011_Senior/usinage/Axe-Ascenseur.pdf differ diff --git a/meca/2011_Senior/usinage/Axe-Codeur.pdf b/meca/2011_Senior/usinage/Axe-Codeur.pdf new file mode 100644 index 0000000..d36491c Binary files /dev/null and b/meca/2011_Senior/usinage/Axe-Codeur.pdf differ diff --git a/meca/2011_Senior/usinage/Axe-Roue.pdf b/meca/2011_Senior/usinage/Axe-Roue.pdf new file mode 100644 index 0000000..e21b6c4 Binary files /dev/null and b/meca/2011_Senior/usinage/Axe-Roue.pdf differ diff --git a/meca/2011_Senior/usinage/Process2.CATProcess b/meca/2011_Senior/usinage/Process2.CATProcess index cb9be57..f6160d2 100644 Binary files a/meca/2011_Senior/usinage/Process2.CATProcess and b/meca/2011_Senior/usinage/Process2.CATProcess differ diff --git a/meca/2011_Senior/usinage/axe-ascenseur.CATDrawing b/meca/2011_Senior/usinage/axe-ascenseur.CATDrawing new file mode 100644 index 0000000..83bafc1 Binary files /dev/null and b/meca/2011_Senior/usinage/axe-ascenseur.CATDrawing differ diff --git a/meca/2011_Senior/usinage/axe-codeur.CATDrawing b/meca/2011_Senior/usinage/axe-codeur.CATDrawing new file mode 100644 index 0000000..b29ec59 Binary files /dev/null and b/meca/2011_Senior/usinage/axe-codeur.CATDrawing differ diff --git a/meca/2011_Senior/usinage/axe-roue.CATDrawing b/meca/2011_Senior/usinage/axe-roue.CATDrawing new file mode 100644 index 0000000..27b9d78 Binary files /dev/null and b/meca/2011_Senior/usinage/axe-roue.CATDrawing differ hooks/post-receive -- krobot |