-
Vincent Pinon authored
Conflicts: README src/mainwindow.cpp src/mainwindow.h src/project/dialogs/slideshowclip.cpp src/project/projectlist.cpp
c00846b0
Conflicts: README src/mainwindow.cpp src/mainwindow.h src/project/dialogs/slideshowclip.cpp src/project/projectlist.cpp