0000000000000000000000000000000000000000 2c3f582d80283ff974cc18e8cb5e3623984a0b1b Bastien SCHER <bscher@pas-r03p12.prolo> 1368108739 +0200	commit (initial): Commit initial
2c3f582d80283ff974cc18e8cb5e3623984a0b1b f02b4ec9b5c6238f9e6120f6a702895757f427da Bastien Scher <bastien0705@gmail.com> 1368113141 +0200	commit: Reindente et ajoute les macros MOI et ADV
f02b4ec9b5c6238f9e6120f6a702895757f427da 305a287b71fb311a80de0caa5cb11b342c7a45b8 Bastien Scher <bastien0705@gmail.com> 1368131423 +0200	commit: Implemente la recuperation des iles colonisables
305a287b71fb311a80de0caa5cb11b342c7a45b8 305a287b71fb311a80de0caa5cb11b342c7a45b8 Bastien Scher <bastien0705@gmail.com> 1368138766 +0200	checkout: moving from master to colonisation-sous-graphes
305a287b71fb311a80de0caa5cb11b342c7a45b8 9105ef7838eb3ee9965c55f09ec9fa0b63bcef53 Bastien Scher <bastien0705@gmail.com> 1368138770 +0200	commit: Implemente l'assignation d'iles aux caravelles par decoupage du graphe
9105ef7838eb3ee9965c55f09ec9fa0b63bcef53 305a287b71fb311a80de0caa5cb11b342c7a45b8 Bastien Scher <bastien0705@gmail.com> 1368138822 +0200	checkout: moving from colonisation-sous-graphes to master
305a287b71fb311a80de0caa5cb11b342c7a45b8 d9cbd3b9ba13953d087e109a651f84cc6f57b4f9 Bastien Scher <bastien0705@gmail.com> 1368139142 +0200	commit: Introduit les plans de colonisation
d9cbd3b9ba13953d087e109a651f84cc6f57b4f9 9105ef7838eb3ee9965c55f09ec9fa0b63bcef53 Bastien Scher <bastien0705@gmail.com> 1368139164 +0200	checkout: moving from master to colonisation-sous-graphes
9105ef7838eb3ee9965c55f09ec9fa0b63bcef53 d9cbd3b9ba13953d087e109a651f84cc6f57b4f9 Bastien Scher <bastien0705@gmail.com> 1368139178 +0200	checkout: moving from colonisation-sous-graphes to d9cbd3b9ba13953d087e109a651f84cc6f57b4f9^0
d9cbd3b9ba13953d087e109a651f84cc6f57b4f9 bcdf92f28435459d6aa59447b84cf7ffd0f4ddf0 Bastien Scher <bastien0705@gmail.com> 1368139222 +0200	rebase: Implemente l'assignation d'iles aux caravelles par decoupage du graphe
bcdf92f28435459d6aa59447b84cf7ffd0f4ddf0 bcdf92f28435459d6aa59447b84cf7ffd0f4ddf0 Bastien Scher <bastien0705@gmail.com> 1368139222 +0200	rebase finished: returning to refs/heads/colonisation-sous-graphes
bcdf92f28435459d6aa59447b84cf7ffd0f4ddf0 d9cbd3b9ba13953d087e109a651f84cc6f57b4f9 Bastien Scher <bastien0705@gmail.com> 1368139231 +0200	checkout: moving from colonisation-sous-graphes to master
d9cbd3b9ba13953d087e109a651f84cc6f57b4f9 376847027b6d26e614ae8680d37486c534fc29ba Bastien Scher <bastien0705@gmail.com> 1368146869 +0200	commit: Implemente la repartition des iles a coloniser grace a k-min
376847027b6d26e614ae8680d37486c534fc29ba 31e08077113077b373262c1fa40436917204f99b Bastien Scher <bastien0705@gmail.com> 1368146984 +0200	commit (amend): Implemente la repartition des iles a coloniser grace a k-mean
31e08077113077b373262c1fa40436917204f99b a336249938d2f955bd0f90f423adcf3f7200d0d4 Bastien Scher <bastien0705@gmail.com> 1368147022 +0200	commit (amend): Implemente la repartition des iles a coloniser grace a k-mean
a336249938d2f955bd0f90f423adcf3f7200d0d4 ea8ebbb119ec18771709470208f45be56dbf59a3 Bastien Scher <bastien0705@gmail.com> 1368150000 +0200	commit: Implemente maj_plans_colonisation
ea8ebbb119ec18771709470208f45be56dbf59a3 78d76c1d69343c2069aa0d084e488a68e9cc94ad Bastien Scher <bastien0705@gmail.com> 1368152689 +0200	commit: Implemente la construction de caravelles pour la colonisation
78d76c1d69343c2069aa0d084e488a68e9cc94ad a336249938d2f955bd0f90f423adcf3f7200d0d4 Bastien Scher <bastien0705@gmail.com> 1368152752 +0200	checkout: moving from master to a336249938d2f955bd0f90f423adcf3f7200d0d4
a336249938d2f955bd0f90f423adcf3f7200d0d4 ea8ebbb119ec18771709470208f45be56dbf59a3 Bastien Scher <bastien0705@gmail.com> 1368152752 +0200	cherry-pick
ea8ebbb119ec18771709470208f45be56dbf59a3 c922141b7d1472152dc14f23634615f7dd96f76f Bastien Scher <bastien0705@gmail.com> 1368152781 +0200	commit (amend): Implemente maj_plans_colonisation
c922141b7d1472152dc14f23634615f7dd96f76f 584c0f037993b255ef45bfdde1c1967c0bcb47dd Bastien Scher <bastien0705@gmail.com> 1368152789 +0200	rebase -i (pick): Implemente la construction de caravelles pour la colonisation
584c0f037993b255ef45bfdde1c1967c0bcb47dd 584c0f037993b255ef45bfdde1c1967c0bcb47dd Bastien Scher <bastien0705@gmail.com> 1368152789 +0200	rebase -i (finish): returning to refs/heads/master
584c0f037993b255ef45bfdde1c1967c0bcb47dd 4a04a6f0ef1d3eea58682c56ebdf91b1678615fb Bastien Scher <bastien0705@gmail.com> 1368155387 +0200	commit: Verifie que les caravelles chargees de colonisation existent toujours
4a04a6f0ef1d3eea58682c56ebdf91b1678615fb 0f967139d6dc46a82e390d63afa902129eb8cfbd Bastien Scher <bastien0705@gmail.com> 1368155488 +0200	commit: Choisit la prochaine ile a coloniser pour chaque caravelle
0f967139d6dc46a82e390d63afa902129eb8cfbd 1847dbe7beba68d10b9b8d78a3ee30de0937e312 Bastien Scher <bastien0705@gmail.com> 1368155633 +0200	commit: Deplace les bateaux de colonisation vers leur cible
1847dbe7beba68d10b9b8d78a3ee30de0937e312 c21bc6cdfe71c6a4709a696868b5dad8df8e8862 Bastien Scher <bastien0705@gmail.com> 1368156455 +0200	commit: Colonise les iles sur lesquelles arrivent les caravelles
c21bc6cdfe71c6a4709a696868b5dad8df8e8862 6623a5f80cb18e87fd8d614480bb5f0efe277bd6 Bastien Scher <bastien0705@gmail.com> 1368158253 +0200	commit: Trie les plans de colonisation selon leur distance a l'ile initiale
6623a5f80cb18e87fd8d614480bb5f0efe277bd6 bbfbd2694f789b64c1b7216ead0904dc786bc28e Bastien Scher <bastien0705@gmail.com> 1368163113 +0200	commit: Ajoute le systeme d'influence
bbfbd2694f789b64c1b7216ead0904dc786bc28e f0bf58b7329681d618d40edbd7e9efc35b59dd20 Bastien Scher <bastien0705@gmail.com> 1368166283 +0200	commit: Introduit le systeme de frontiere
f0bf58b7329681d618d40edbd7e9efc35b59dd20 d35a7ed9147a37a8b41618829dda30622a756083 Bastien Scher <bastien0705@gmail.com> 1368167975 +0200	commit: Implemente la construction de galions
d35a7ed9147a37a8b41618829dda30622a756083 2f4c87a6c4af2bed451d016a042702323492822a Bastien Scher <bastien0705@gmail.com> 1368190499 +0200	commit: Corrige une division par zero
2f4c87a6c4af2bed451d016a042702323492822a 928bff8363ff29fc447f5f5ee30c88e106f76daf Bastien Scher <bastien0705@gmail.com> 1368192212 +0200	commit: Implement le deplacement (con) des galions
928bff8363ff29fc447f5f5ee30c88e106f76daf 4479cba35edbc5b31a5f50d9f2974d032228e0b1 Bastien Scher <bastien0705@gmail.com> 1368192694 +0200	commit: Recentre les unites en mettant au carre les probabilites
4479cba35edbc5b31a5f50d9f2974d032228e0b1 c80e462fd3bfd5ac2801682271fac282a8e77fb8 Bastien Scher <bastien0705@gmail.com> 1368205057 +0200	commit: Implemente l'attaque
c80e462fd3bfd5ac2801682271fac282a8e77fb8 dbd17794cad6be3e495612e2b4b6a2a75273c81a Bastien Scher <bastien0705@gmail.com> 1368205621 +0200	commit: Corrige une erreur quand on n'a plus d'ile
dbd17794cad6be3e495612e2b4b6a2a75273c81a 12e5d1781b61fdd5ed06bf8f92b74b7a65037e19 Bastien Scher <bastien0705@gmail.com> 1368217196 +0200	commit: Ajoute le support des volcans
12e5d1781b61fdd5ed06bf8f92b74b7a65037e19 aa84283effc6792c0982e1b5417126f4fbaaaf42 Bastien Scher <bastien0705@gmail.com> 1368218924 +0200	commit (amend): Ajoute le support des volcans
aa84283effc6792c0982e1b5417126f4fbaaaf42 7a68eddf805f00521a473002ea00d28b42f3c5be Bastien Scher <bastien0705@gmail.com> 1368225425 +0200	commit: Ajout de README
7a68eddf805f00521a473002ea00d28b42f3c5be 9c5bfd71a515bc9bd50daf35d7d6fcd4a4163e78 Bastien Scher <bastien0705@gmail.com> 1368225450 +0200	commit: Gere les volcans
