modif fichier de conf
Merge branch 'Romain' of https://github.com/TeriRomain/MDL.git
interface ajout theme
Merge remote-tracking branch 'origin/Romain' into Dev
Merge remote-tracking branch 'origin/Dev' into Romain
tache 3 : interface graphique
20/11/2014
Merge remote-tracking branch 'origin/Romain' into Dev
ajout de la procedure Vider_Champs

Signed-off-by: ducoudrayalex <ducoudray.alex@gmail.com>
test

Signed-off-by: ducoudrayalex <ducoudray.alex@gmail.com>
Merge remote-tracking branch 'origin/Alex' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
Merge remote-tracking branch 'origin/ClÃ©ment' into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs

Signed-off-by: Clément JOLLIET <jolliet.clement@gmail.com>
repair
22/11/2014
23/11/2014
Test de commit

Test de commit to Dev (2 files)
Merge branch 'Dev' of https://github.com/TeriRomain/MDL into Dev

Conflicts:
	MaisonDesLigues/FrmPrincipale.Designer.cs
	MaisonDesLigues/FrmPrincipale.cs
	MaisonDesLigues/MaisonDesLigues.csproj