add char œ support [ci skip]
Merge branch 'master' into taSpecialChars
change variables names [ci skip]
Merge branch 'master' into taSpecialChars

Conflicts:
	.doxygen
	app/Joker/Joker.pro
	app/Joker/VideoStripView.cpp
	libs/PhVideo/PhVideo.pri
	libs/PhVideo/PhVideoEngine.cpp
	libs/PhVideo/PhVideoEngine.h
	libs/PhVideo/PhVideoView.cpp
	tests/AutoTest/AutoTest.pro
	tests/AutoTest/VideoTest.cpp
	tests/AutoTest/VideoTestSettings.h
	tests/AutoTest/main.cpp
	tests/VideoSyncTest/VideoSyncTestSettings.h
	tests/VideoTest/VideoTestWindow.cpp
post merge fix
"fix" the tests (see description)

as the tests doesn’t work on my computer with the spaces I removed its
and test on Travis
Revert ""fix" the tests (see description)"

This reverts commit f74559f09a6004be72dd9cf1ac389d0d87ed69ff.

Travis seems to work in a different way than my computer about ending
line spaces
change GraphicStripTest filter to *.joker
Add next/previous loop command
Add display cuts in prefs
fix #184
Merge pull request #187 from Phonations/fixNewLine

fix #184 :+1:
Merge branch 'master' into taSpecialChars

Conflicts:
	libs/PhGraphic/PhFont.cpp
	tests/AutoTest/GraphicTextTest.cpp
[ci skip]
remove useless modif
fix missing setting
uncrustify
fix settings again
Change to put a menu instead of pref
Introduce a bool to fix the bug
Merge pull request #188 from Phonations/DisplayOptions

Display cut options fix #183