plop
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe.git
fusion rom
Conflicts:
	StreaMe.pro.user

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
plop

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe.git

Conflicts:
	StreaMe.pro.user

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
qssddqsd

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe.git

Conflicts:
	StreaMe.pro.user
	mainwindow.cpp

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>
Merge branch 'master' of https://github.com/benoitBrayer/StreaMe.git
resize modif main window

Signed-off-by: RomaricDel <delaunoy.r@gmail.com>