- 15 Jan, 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"
-
- 11 Jan, 2016 1 commit
-
-
Laurent Montel authored
-
- 04 Jan, 2016 1 commit
-
-
Daniel Vrátil authored
-
- 27 Dec, 2015 1 commit
-
-
Daniel Vrátil authored
-
- 18 Dec, 2015 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"
-
- 17 Dec, 2015 1 commit
-
-
Xuetian Weng authored
-
- 13 Dec, 2015 1 commit
-
-
Script Kiddy authored
-
- 09 Dec, 2015 2 commits
-
-
Script Kiddy 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"
-
- 08 Dec, 2015 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 06 Dec, 2015 1 commit
-
-
Daniel Vrátil authored
-
- 03 Dec, 2015 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 30 Nov, 2015 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 29 Nov, 2015 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
FIXED-IN: 5.1 BUG: 353664
-
- 24 Nov, 2015 4 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
FIXED-IN: 5.1 BUG: 355746
-
Laurent Montel authored
-
- 23 Nov, 2015 1 commit
-
-
Laurent Montel authored
-
- 15 Nov, 2015 3 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
Laurent Montel authored
-
- 11 Nov, 2015 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 10 Nov, 2015 1 commit
-
-
Laurent Montel authored
-
- 08 Nov, 2015 1 commit
-
-
Sergio Martins authored
-
- 06 Nov, 2015 1 commit
-
-
Laurent Montel authored
-
- 04 Nov, 2015 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"
-
- 29 Oct, 2015 1 commit
-
-
Laurent Montel authored
-
- 28 Oct, 2015 1 commit
-
-
Laurent Montel authored
-
- 25 Oct, 2015 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"
-
- 21 Oct, 2015 1 commit
-
-
Laurent Montel authored
-
- 17 Oct, 2015 2 commits
-
-
Volker Krause authored
-
Sergio Martins authored
-