~neon/phonon/gstreamer : changes

~neon/phonon/gstreamer » Changes from revision 2680

From Revision 2648 to 2629

Rev	Summary	Authors	Date
2648	Merge branch '4.9' Merge branch '4.9' # Conflicts: # gstreamer/gstreamer.desktop.cmake	Harald Sitter	4 years ago
2647	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	4 years ago
2646	Merge branch '4.9' Merge branch '4.9' # Conflicts: # gstreamer/gstreamer.desktop.cmake	Harald Sitter	4 years ago
2645	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	4 years ago
2644	Merge branch '4.9' Merge branch '4.9'	Daniel Vrátil	4 years ago
2643	Merge remote-tracking branch 'origin/4.9' Merge remote-tracking branch 'origin/4.9'	Luigi Toscano	4 years ago
2642	Merge remote-tracking branch 'origin/4.9' Merge remote-tracking branch 'origin/4.9'	Pino Toscano	4 years ago
2641	Fix a crash. Fix a crash. Summary: Fix a regression introduced in D20379 Test Plan: Compiles and runs Reviewers: dvratil, O4 phonon Reviewed By: dvratil Differential Revision: https://phabricator.kde.org/D20539	Méven Car	5 years ago
2640	Avoid using subtitles of a previously played media Avoid using subtitles of a previously played media Summary: When a media object detected a subtitle, this one is used in all subsequent playback until another subtitle is set. Test Plan: Localy tested. Reviewers: O4 phonon, dvratil Reviewed By: dvratil Differential Revision: https://phabricator.kde.org/D20379	Méven Car	5 years ago
2639	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	5 years ago
2638	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	5 years ago
2637	Do not trigger paused state on 0 percentage Do not trigger paused state on 0 percentage Differential Revision: https://phabricator.kde.org/D14241 Signed-off-by: Anthony Fieroni <bvbfan@abv.bg>	Anthony Fieroni	5 years ago
2636	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	5 years ago
2635	Remove unused file Remove unused file	Laurent Montel	6 years ago
2634	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	6 years ago
2633	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	6 years ago
2632	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	6 years ago
2631	SVN_SILENT made messages (.desktop file) - always resolve ou... SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"	l10n daemon script	6 years ago
2630	bump version to 4.9.0 for release prep bump version to 4.9.0 for release prep	Harald Sitter	8 years ago
2629	Fix Qt4 build Fix Qt4 build	Daniel Vrátil	8 years ago