TEST
Delete Bomberman.pro.user
Delete Bomberman.pro.user.325c352
Delete Bomberman.pro.user.357a52f
Delete test
Delete test.txt
Merge branch 'master' of https://github.com/CPI4Admin/BomberMan.git into RomanLOGVINOV
Merge branch 'master' of https://github.com/CPI4Admin/BomberMan.git into RomanLOGVINOV
Merge branch 'master' of https://github.com/CPI4Admin/BomberMan.git into RomanLOGVINOV
stats sur le mainwindow

Signed-off-by: Thibaud Cutullic <tcutullic@gmail.com>
Merge pull request #16 from CPI4Admin/Thibaud

stats sur le mainwindow
Merge pull request #17 from CPI4Admin/druidpollux

Add CMakeLists.txt file allowing to generate solution from cmake
Merge branch 'master' of https://github.com/CPI4Admin/BomberMan.git into RomanLOGVINOV
Modification du fichier mainwindow.cpp

Rajout de messages dans la barre de statut dans les différentes fonctions


Signed-off-by: Petra KRATOCHVILOVA <petra.lat@gmail.com>
Update mainwindow.cpp
Merge pull request #18 from CPI4Admin/Yoann

Yoann
Merge branch 'Yoann' of https://github.com/CPI4Admin/BomberMan.git into RomanLOGVINOV
Modification de la fenetre de lancement de la partie SOLO (launchsologame)

Signed-off-by: unknown <rlogvinov@port-Roman.arcadie-informatique.net>
Ajout Ligne de Yann dans networkserver.cpp
Signed-off-by: unknown <rlogvinov@port-Roman.arcadie-informatique.net>