Commits · 17b7f4d85632e0e238b49ada0b1a7c12f16035fd · Victor / Krabi · GitLab

Mar 26, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 17b7f4d8
  root authored Mar 26, 2015
  
  17b7f4d8
- Modification fichier projet et quelques references a de vieux fichiers · 8dd2641c
  Cecile Bouette authored Mar 26, 2015
  
  8dd2641c
- Rangement des vieux fichiers · 77327ee1
  Cecile Bouette authored Mar 26, 2015
  
  77327ee1
- Re introduction des modifications des commits annules · 70a71543
  Cecile Bouette authored Mar 26, 2015
  
  70a71543
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 8ca65ff9
  root authored Mar 26, 2015
  
  8ca65ff9
- Revert "Merge branch 'master' of em6.club.resel.fr:gitRobotique" · 0ae0a18d
  Cecile Bouette authored Mar 26, 2015
```
This reverts commit fa4e8f33, reversing
changes made to a72f126c.

Tentative de revert du git
```
  0ae0a18d
Mar 25, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · da3f1d61
  root authored Mar 25, 2015
  
  da3f1d61
- Merge branch 'master' of em6.club.resel.fr:gitRobotique · fa4e8f33
  Cecile Bouette authored Mar 25, 2015
```
Conflicts:
	stm32/main107.list
	stm32/main107.out
	stm32/paprika_krabi_h107.cbp
	stm32/paprika_krabi_h107.depend
```
  fa4e8f33
- changement de braslateral en brasLateraux et changement de couleur des ecritures du simulateur · 288ec6a7
  Cecile Bouette authored Mar 25, 2015
  
  288ec6a7
- changement couleur simulateur · 74e22d22
  Cecile Bouette authored Mar 25, 2015
  
  74e22d22
- renommage de braslateral en brasLateraux · 440ad7d3
  Cecile Bouette authored Mar 25, 2015
  
  440ad7d3
Mar 23, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 968b1c5e
  root authored Mar 23, 2015
  
  968b1c5e
- Ajout layout fichier projet C::B · a72f126c
  Dylan SADOUN authored Mar 23, 2015
  
  a72f126c
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 32363d78
  root authored Mar 23, 2015
  
  32363d78
- Suppresion du suivi du git de vieux fichiers · fa08b542
  Victor Dubois authored Mar 23, 2015
  
  fa08b542
- Nettoyage code et fichiers projet · 175b653f
  Victor Dubois authored Mar 23, 2015
  
  175b653f
Mar 21, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · d9fd2cd2
  root authored Mar 21, 2015
  
  d9fd2cd2
- juste rendu commitable le dernier commit · 3f3e3038
  Maxime JEAN authored Mar 21, 2015
  
  3f3e3038
Mar 19, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · ea43453b
  root authored Mar 19, 2015
  
  ea43453b
- ajouts points graph · db68f5bb
  Cecile Bouette authored Mar 19, 2015
  
  db68f5bb
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · b914ff6b
  root authored Mar 19, 2015
  
  b914ff6b
- héritage de BrasKrabi par BrasTapis · 2411b0cb
  Cecile Bouette authored Mar 19, 2015
  
  2411b0cb
Mar 17, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 5d695aa7
  root authored Mar 17, 2015
  
  5d695aa7
- changement de noms des classes bras2 et brasavant · 467f172b
  Cecile Bouette authored Mar 17, 2015
  
  467f172b
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 7f6dc8ac
  root authored Mar 17, 2015
  
  7f6dc8ac
- corection sur bras2 et brasavant · d47f445e
  Cecile Bouette authored Mar 17, 2015
  
  d47f445e
Mar 16, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 47b919ff
  root authored Mar 16, 2015
  
  47b919ff
- ajout de tapis et ajout de l'actionneur bras pour e · 43e304d8
  Cecile Bouette authored Mar 16, 2015
```
le tapis sous la forme de deux classes : bras2 et brasavant
```
  43e304d8
Mar 10, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · a64c9b20
  root authored Mar 10, 2015
  
  a64c9b20
- Merged · fe630242
  Dorian Gilly authored Mar 10, 2015
  
  fe630242
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · f8c4f808
  root authored Mar 10, 2015
  
  f8c4f808
- commit intermediaire pour le tuto git · 06cbb955
  Dylan SADOUN authored Mar 10, 2015
  
  06cbb955
- Changement de commentaire · 2519130d
  Dorian Gilly authored Mar 10, 2015
  
  2519130d
Mar 05, 2015
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 3cffbeab
  root authored Mar 06, 2015
  
  3cffbeab
- Fichier CBP · dff640fa
  Cecile Bouette authored Mar 06, 2015
  
  dff640fa
- Layout enlevé des commits · 89d21b5a
  Cecile Bouette authored Mar 06, 2015
  
  89d21b5a
- ajout de krabijunior et modif graph krabi · e5a460c4
  Cecile Bouette authored Mar 06, 2015
  
  e5a460c4
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 29bc9bc8
  root authored Mar 05, 2015
  
  29bc9bc8
- Try2 merge on master · f3b70a91
  Cecile Bouette authored Mar 05, 2015
  
  f3b70a91
- Merge branch 'master' of /srv/git/hook_robotique/../repositories/gitRobotique · 611639a5
  root authored Mar 05, 2015
  
  611639a5