Commits · d685eeb42bccf24233a6c221498fcbdddd675fe5 · Games / KSquares

04 Sep, 2017 1 commit

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

Script Kiddy authored Sep 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"

d685eeb4

30 Jul, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4b39d741
  Script Kiddy authored Jul 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"
```
  4b39d741
- GIT_SILENT made messages (after extraction) · fd6b0636
  Script Kiddy authored Jul 30, 2017
  
  fd6b0636
27 Jul, 2017 1 commit

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

Script Kiddy authored Jul 27, 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"

bc5b9dd8

15 Jul, 2017 1 commit
- Merge remote-tracking branch 'origin/Applications/17.04' · 0ae0ddd9
  Luigi Toscano authored Jul 15, 2017
  
  0ae0ddd9
11 Jul, 2017 2 commits
- GIT_SILENT made messages (after extraction) · b861cbf5
  Script Kiddy authored Jul 11, 2017
  
  b861cbf5
- GIT_SILENT made messages (after extraction) · f6b95848
  Script Kiddy authored Jul 11, 2017
  
  f6b95848
04 Jul, 2017 1 commit

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

Script Kiddy authored Jul 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"

de62f712

01 Jul, 2017 1 commit
- GIT_SILENT made messages (after extraction) · fe60b88b
  Script Kiddy authored Jul 01, 2017
  
  fe60b88b
15 Jun, 2017 1 commit
- Fix wayland support · 0d96c186
  Laurent Montel authored Jun 15, 2017
  
  0d96c186
13 Jun, 2017 1 commit
- GIT_SILENT made messages (after extraction) · 309a3252
  Script Kiddy authored Jun 13, 2017
  
  309a3252
08 Jun, 2017 1 commit
- GIT_SILENT made messages (after extraction) · da413c54
  Script Kiddy authored Jun 08, 2017
  
  da413c54
01 Jun, 2017 1 commit
- USe Q_DECL_OVERRIDE · 415cbb94
  Laurent Montel authored Jun 01, 2017
  
  415cbb94
30 May, 2017 2 commits

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

Script Kiddy authored May 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"

acd03f91

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

Script Kiddy authored May 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"

7baa4221

24 May, 2017 2 commits

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

Script Kiddy authored May 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"

59294428

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

Script Kiddy authored May 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"

6b9a40ff

26 Mar, 2017 1 commit

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

Script Kiddy authored Mar 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"

20ca293f

23 Mar, 2017 1 commit
- GIT_SILENT made messages (after extraction) · ea1f25f2
  Script Kiddy authored Mar 23, 2017
  
  ea1f25f2
20 Mar, 2017 1 commit
- GIT_SILENT made messages (after extraction) · 273e4278
  Script Kiddy authored Mar 20, 2017
  
  273e4278
07 Mar, 2017 1 commit

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

Script Kiddy authored Mar 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"

10bd39ec

05 Mar, 2017 1 commit

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

Script Kiddy authored Mar 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"

9e72fb82

23 Feb, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f698ffe0
  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"
```
  f698ffe0
- GIT_SILENT made messages (after extraction) · a24b7ffe
  Script Kiddy authored Feb 23, 2017
  
  a24b7ffe
20 Feb, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0203c5cb
  Script Kiddy authored Feb 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"
```
  0203c5cb
- GIT_SILENT made messages (after extraction) · 6a3c3652
  Script Kiddy authored Feb 20, 2017
  
  6a3c3652
16 Feb, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0ae82c70
  Script Kiddy authored Feb 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"
```
  0ae82c70
- GIT_SILENT made messages (after extraction) · 054c98e3
  Script Kiddy authored Feb 16, 2017
  
  054c98e3
12 Feb, 2017 1 commit

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

Script Kiddy authored Feb 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"

63dbf0eb

09 Feb, 2017 1 commit

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

Script Kiddy authored Feb 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"

7a36e125

06 Feb, 2017 1 commit

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

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"

5d8e4c08

05 Feb, 2017 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · bcfbebae
  Script Kiddy authored Feb 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"
```
  bcfbebae
- GIT_SILENT made messages (after extraction) · 479f99ad
  Script Kiddy authored Feb 05, 2017
  
  479f99ad
04 Feb, 2017 1 commit

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

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"

3d660313

03 Feb, 2017 1 commit

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

Script Kiddy authored Feb 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"

441cd0ce

01 Feb, 2017 2 commits

Merge branch 'Applications/16.12' · 4dc0d288
Harald Sitter authored Feb 01, 2017

4dc0d288

use the genericname as comment · 399c99f8

Harald Sitter authored Feb 01, 2017

In absence of an appdata file, appstream tries to determine its required
fields through the desktop file, currently ksquares is missing a summary
which would get pulled from the Comment entry in the desktop file.
Since the GenericName can easily double as (not all too grand) Comment
here, simply copy it to reduce l10n work.

Not having appstream data prevents the application from showing up
in software stores we'll want this fixed in a bugfix release of 16.12.

REVIEW: 129888

399c99f8

30 Jan, 2017 1 commit
- GIT_SILENT made messages (after extraction) · 703a9ebd
  Script Kiddy authored Jan 30, 2017
  
  703a9ebd
28 Jan, 2017 1 commit
- GIT_SILENT made messages (after extraction) · 5e82fc3b
  Script Kiddy authored Jan 28, 2017
  
  5e82fc3b
26 Jan, 2017 1 commit
- add appstream data · bfb5cc00
  Harald Sitter authored Jan 26, 2017
  
  bfb5cc00