Merge branch 'VersionLocal'
Merge pull request #18 from Ysnir/master

Correction Noms de Classes
Ajout du fichier config.xml et de JDOM
Merge branch 'master' into VersionLocal
Merge branch 'master' of https://github.com/Porquepix/PiixColor
Ajout JDOM et config.xml
Merge pull request #19 from Porquepix/VersionLocal

Ajout du fichier config.xml et de JDOM
Merge pull request #21 from Porquepix/master

Merge pull request #19 from Porquepix/VersionLocal
Merge pull request #22 from Porquepix/VersionLocal

Merge pull request #21 from Porquepix/master
Merge pull request #23 from Porquepix/master

Merge pull request #22 from Porquepix/VersionLocal
Merge pull request #24 from Porquepix/VersionLocal

Merge pull request #23 from Porquepix/master
Merge pull request #25 from Porquepix/master

Merge pull request #24 from Porquepix/VersionLocal
Merge pull request #26 from Porquepix/VersionLocal

Merge pull request #25 from Porquepix/master
Merge pull request #27 from Porquepix/master

Merge pull request #26 from Porquepix/VersionLocal
Test resolution bug
Merge branch 'VersionLocal' of https://github.com/Porquepix/PiixColor into VersionLocal
Merge pull request #29 from Porquepix/VersionLocal

Version local
Resolution conflit
Merge pull request #32 from Porquepix/Ysnir-master

Ysnir master
Merge pull request #4 from Porquepix/master

Recup