- 04 Nov, 2017 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"
-
- 02 Nov, 2017 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 Jul, 2017 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"
-
- 23 Feb, 2017 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"
-
- 30 Jan, 2017 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"
-
- 12 Apr, 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"
-
- 18 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"
-
- 03 Apr, 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"
-
- 25 Feb, 2015 1 commit
-
-
Script Kiddy authored
-
- 25 Oct, 2014 1 commit
-
-
Script Kiddy authored
-
- 25 Jul, 2014 1 commit
-
-
Script Kiddy authored
-
- 24 Jul, 2014 1 commit
-
-
Script Kiddy authored
-
- 30 Jun, 2014 1 commit
-
-
Script Kiddy authored
-
- 27 Jun, 2014 1 commit
-
-
Script Kiddy authored
-
- 03 Jun, 2014 1 commit
-
-
Script Kiddy authored
-
- 17 May, 2014 1 commit
-
-
Script Kiddy authored
-
- 27 Apr, 2014 1 commit
-
-
Script Kiddy authored
-
- 08 Apr, 2014 1 commit
-
-
Script Kiddy authored
-
- 05 Apr, 2014 1 commit
-
-
Script Kiddy authored
-
- 04 Apr, 2014 1 commit
-
-
Script Kiddy authored
-
- 02 Apr, 2014 1 commit
-
-
Script Kiddy authored
-
- 31 Mar, 2014 3 commits
-
-
Albert Astals Cid authored
Conflicts: baloo/nepomukbaloomigrator.desktop
-
Albert Astals Cid authored
Conflicts: services/fileindexer/indexer/nepomukofficeextractor.desktop
-
Albert Astals Cid authored
-
- 27 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 26 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 25 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 24 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 23 Mar, 2014 2 commits
-
-
Script Kiddy authored
-
Script Kiddy authored
-
- 22 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 21 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 20 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 19 Mar, 2014 1 commit
-
-
Script Kiddy authored
-
- 17 Mar, 2014 6 commits
-
-
Jonathan Esk-Riddell authored
-
Jonathan Esk-Riddell authored
-
Jonathan Esk-Riddell authored
-
Jonathan Esk-Riddell authored
-
Script Kiddy authored
-
Script Kiddy authored
-