- 02 Mar, 2016 7 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
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
-
- 01 Mar, 2016 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 29 Feb, 2016 4 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
-
- 27 Feb, 2016 2 commits
-
-
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
-
- 26 Feb, 2016 2 commits
-
-
Laurent Montel authored
-
Sandro Knauß authored
because if ObjectTreeSourceIf is changed we do not want to update the tests everytime.
-
- 24 Feb, 2016 2 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
- 23 Feb, 2016 8 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
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
-
- 22 Feb, 2016 8 commits
-
-
Laurent Montel authored
-
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
-
- 21 Feb, 2016 4 commits
-
-
Laurent Montel authored
-
Laurent Montel authored
-
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"
-
- 20 Feb, 2016 1 commit
-
-
Laurent Montel authored
-