- 05 Nov, 2016 1 commit
-
-
Script Kiddy authored
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"
-
- 04 Nov, 2016 1 commit
-
-
Script Kiddy authored
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"
-
- 03 Nov, 2016 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 02 Nov, 2016 9 commits
-
-
-
Laurent Montel authored
-
Script Kiddy authored
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"
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 01 Nov, 2016 6 commits
-
-
David Faure authored
-
David Faure authored
Also rename WebPage to WebEnginePage, to reduce confusion and avoid conflicting with KWebkitPart's classes
-
Script Kiddy authored
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"
-
David Faure authored
(this way I don't end up in the WebView QML documentation in Qt assistant...)
-
David Faure authored
CCMAIL: bvbfan@abv.bg
-
David Faure authored
-
- 31 Oct, 2016 14 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
kdelibs4support
-
Luigi Toscano authored
-
Script Kiddy authored
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"
-
David Faure authored
in theory we should test that we got a texteditor part here, but not the most pressing thing right now
-
David Faure authored
-
David Faure authored
-
David Faure authored
-
David Faure authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 30 Oct, 2016 7 commits
-
-
-
Laurent Montel authored
-
Script Kiddy authored
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"
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-