Commits · 6b9a40ff5db219191d413ba5c3fff51b8a02c71a · Games / KSquares

24 May, 2017 1 commit

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

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
20 Dec, 2016 1 commit

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

Script Kiddy authored Dec 20, 2016

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"

a6b445c1

14 Jun, 2016 1 commit
- remove kde desktop environment · 93f3bad4
  Burkhard Lück authored Jun 14, 2016
  
  93f3bad4
10 May, 2016 1 commit

Proofread + update KSquares handbook to 16.04 · 3c91b114

Burkhard Lück authored May 10, 2016

remove entities kappname, kappversion, package - not used anymore
bump date + releaseinfo
add screenshots
remove obsolete info about filled lines depending on ai
remove appendix

3c91b114

30 Apr, 2016 1 commit
- Add .gitignore file. · 60739c28
  Frederik Schwarzer authored Apr 30, 2016
  
  60739c28
07 Apr, 2016 1 commit
- Silence CMake warning CMP0063. · 43364ac0
  Frederik Schwarzer authored Apr 08, 2016
  
  43364ac0
10 Mar, 2016 1 commit
- rand() -> qrand() · ad869c67
  Frederik Schwarzer authored Mar 10, 2016
  
  ad869c67
08 Mar, 2016 4 commits
- Mark explicit. · fa5158d3
  Frederik Schwarzer authored Mar 08, 2016
  
  fa5158d3
- Cleanup includes. · c545e094
  Frederik Schwarzer authored Mar 08, 2016
  
  c545e094
- Spelling. · f54473de
  Frederik Schwarzer authored Mar 08, 2016
  
  f54473de
- rand() -> qrand() · 26701de9
  Frederik Schwarzer authored Mar 08, 2016
  
  26701de9
15 Feb, 2016 1 commit
- Remove unused dependencies. · e150d9dc
  Michael Palimaka authored Feb 15, 2016
```
REVIEW: 126815
```
  e150d9dc
27 Jan, 2016 2 commits
- Compile more strictly. · b7dc6e8b
  Frederik Schwarzer authored Jan 27, 2016
  
  b7dc6e8b
- Use KCrash. · fbe32bbe
  Frederik Schwarzer authored Jan 27, 2016
  
  fbe32bbe
11 Nov, 2015 1 commit
- Fix homepage link in about dialog. · efbf4d3b
  Frederik Schwarzer authored Nov 11, 2015
  
  efbf4d3b
28 Oct, 2015 1 commit
- Use new connect api + QStringLiteral · 005e94d9
  Laurent Montel authored Oct 28, 2015
  
  005e94d9
25 Jul, 2015 1 commit
- Fix build. · 83871cef
  Michael Palimaka authored Jul 26, 2015
```
It broke after KF5KDELibs4Support was removed from libkdegames.
```
  83871cef
19 Jul, 2015 1 commit
- Remove unneded include · 3b7075c3
  Albert Astals Cid authored Jul 19, 2015
  
  3b7075c3
18 Jul, 2015 1 commit
- remove commented code · de9b6a8f
  Albert Astals Cid authored Jul 19, 2015
  
  de9b6a8f