Commits · master · Unmaintained / KDE Runtime

02 Nov, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · d7655450

Script Kiddy authored Nov 02, 2017

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"

d7655450

30 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 00608d81

Script Kiddy authored Oct 30, 2017

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"

00608d81

22 Oct, 2017 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · 6d5ec806

Script Kiddy authored Oct 23, 2017

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"

6d5ec806

SVN_SILENT made messages (.desktop file) - always resolve ours · f8d1abb5

Script Kiddy authored Oct 22, 2017

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"

f8d1abb5

19 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 65c592a8

Script Kiddy authored Oct 20, 2017

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"

65c592a8

18 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · ad069f10

Script Kiddy authored Oct 18, 2017

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"

ad069f10

16 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · f3218c7c

Script Kiddy authored Oct 16, 2017

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"

f3218c7c

14 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 3f01ae02

Script Kiddy authored Oct 14, 2017

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"

3f01ae02

12 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c3bb5e27

Script Kiddy authored Oct 12, 2017

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"

c3bb5e27

10 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · fcf562d4

Script Kiddy authored Oct 10, 2017

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"

fcf562d4

09 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · eeeee9de

Script Kiddy authored Oct 09, 2017

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"

eeeee9de

05 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 54d4741d

Script Kiddy authored Oct 05, 2017

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"

54d4741d

04 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 13fd8d73

Script Kiddy authored Oct 04, 2017

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"

13fd8d73

01 Oct, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5f0bb1f8

Script Kiddy authored Oct 01, 2017

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"

5f0bb1f8

30 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e9116aa4

Script Kiddy authored Sep 30, 2017

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"

e9116aa4

28 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 7f0c8db3

Script Kiddy authored Sep 28, 2017

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"

7f0c8db3

26 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · fbf872a3

Script Kiddy authored Sep 26, 2017

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"

fbf872a3

16 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 5c9e5f03

Script Kiddy authored Sep 16, 2017

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"

5c9e5f03

11 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 8f1fd971

Script Kiddy authored Sep 11, 2017

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"

8f1fd971

10 Sep, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 44b5f509

Script Kiddy authored Sep 10, 2017

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"

44b5f509

02 Sep, 2017 2 commits

SVN_SILENT made messages (.desktop file) - always resolve ours · d11e3184

Script Kiddy authored Sep 03, 2017

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"

d11e3184

SVN_SILENT made messages (.desktop file) - always resolve ours · 1069a92f

Script Kiddy authored Sep 02, 2017

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"

1069a92f

13 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 1c1d6012

Script Kiddy authored Aug 13, 2017

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"

1c1d6012

11 Aug, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 0f573abc

Script Kiddy authored Aug 11, 2017

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"

0f573abc

29 Jul, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e6d758c0

Script Kiddy authored Jul 29, 2017

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"

e6d758c0

15 Jul, 2017 1 commit
- Merge remote-tracking branch 'origin/Applications/17.04' · 7f0e06f0
  Luigi Toscano authored Jul 15, 2017
  
  7f0e06f0
29 Jun, 2017 1 commit
- SVN_SILENT made messages (.desktop file) · cca74b55
  Script Kiddy authored Jun 29, 2017
  
  cca74b55
28 Jun, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9dd8654d

Script Kiddy authored Jun 29, 2017

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"

9dd8654d

10 Jun, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2e5a7fc5

Script Kiddy authored Jun 11, 2017

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"

2e5a7fc5

02 Jun, 2017 1 commit
- SVN_SILENT made messages (.desktop file) · 392ba0b7
  Script Kiddy authored Jun 02, 2017
  
  392ba0b7
01 Jun, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · c38fcbfc

Script Kiddy authored Jun 02, 2017

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"

c38fcbfc

06 May, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · aee5d087

Script Kiddy authored May 07, 2017

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"

aee5d087

30 Apr, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 91c3493d
  Script Kiddy authored May 01, 2017
```
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"
```
  91c3493d
- SVN_SILENT made messages (.desktop file) · 698cef27
  Script Kiddy authored Apr 30, 2017
  
  698cef27
23 Apr, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · af9f02c8

Script Kiddy authored Apr 24, 2017

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"

af9f02c8

01 Mar, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 90389306

Script Kiddy authored Mar 01, 2017

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"

90389306

28 Feb, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · bed71a29

Script Kiddy authored Feb 28, 2017

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"

bed71a29

23 Feb, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · cf8595e8

Script Kiddy authored Feb 23, 2017

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"

cf8595e8

06 Feb, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 613fd2bd

Script Kiddy authored Feb 06, 2017

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"

613fd2bd

04 Feb, 2017 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 80c25d37

Script Kiddy authored Feb 04, 2017

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"

80c25d37