Commits · 8b7ff96b00521e7c14e0b5622d5babe90e357861 · Games / KBounce

26 Jan, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 8b7ff96b
  Script Kiddy authored Jan 26, 2019
  
  8b7ff96b
20 Jan, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 4715109f
  Script Kiddy authored Jan 20, 2019
  
  4715109f
17 Jan, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 9c4ea756
  Script Kiddy authored Jan 17, 2019
  
  9c4ea756
13 Jan, 2019 1 commit
- Const'ify · 75074492
  Laurent Montel authored Jan 13, 2019
  
  75074492
12 Jan, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 0f9efe9d
  Script Kiddy authored Jan 12, 2019
  
  0f9efe9d
11 Jan, 2019 1 commit
- Add content_rating oars 1.1 · 619f2cd9
  Nick Richards authored Jan 11, 2019 and Albert Astals Cid committed Jan 11, 2019
  
  619f2cd9
06 Jan, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 3430426c
  Script Kiddy authored Jan 06, 2019
  
  3430426c
24 Dec, 2018 1 commit
- GIT_SILENT made messages (after extraction) · 72b24ad1
  Script Kiddy authored Dec 24, 2018
  
  72b24ad1
21 Dec, 2018 1 commit
- GIT_SILENT made messages (after extraction) · c30b243e
  Script Kiddy authored Dec 21, 2018
  
  c30b243e
12 Dec, 2018 1 commit
- GIT_SILENT: ignore file · 9a3554a7
  Laurent Montel authored Dec 12, 2018
  
  9a3554a7
03 Dec, 2018 1 commit
- GIT_SILENT made messages (after extraction) · b8f1fb8d
  Script Kiddy authored Dec 03, 2018
  
  b8f1fb8d
21 Nov, 2018 1 commit
- GIT_SILENT made messages (after extraction) · c67e197b
  Script Kiddy authored Nov 21, 2018
  
  c67e197b
18 Nov, 2018 1 commit
- GIT_SILENT made messages (after extraction) · aaa1bf9e
  Script Kiddy authored Nov 18, 2018
  
  aaa1bf9e
16 Nov, 2018 1 commit
- GIT_SILENT made messages (after extraction) · 45b3d9f1
  Script Kiddy authored Nov 16, 2018
  
  45b3d9f1
15 Nov, 2018 1 commit
- GIT_SILENT made messages (after extraction) · 86a9cba9
  Script Kiddy authored Nov 15, 2018
  
  86a9cba9
14 Nov, 2018 1 commit
- GIT_SILENT made messages (after extraction) · 634435ae
  Script Kiddy authored Nov 14, 2018
  
  634435ae
13 Nov, 2018 1 commit
- GIT_SILENT made messages (after extraction) · 058e3376
  Script Kiddy authored Nov 13, 2018
  
  058e3376
11 Nov, 2018 2 commits

Gregor Mi authored Nov 11, 2018

Reviewers: #kde_games, aacid

Reviewed By: aacid

Subscribers: kde-games-devel

Differential Revision: https://phabricator.kde.org/D16803

e59bf042

Add .arcconfig · 4fd14dae

Gregor Mi authored Nov 11, 2018

Reviewers: #kde_games, aacid

Reviewed By: aacid

Subscribers: kde-games-devel

Differential Revision: https://phabricator.kde.org/D16804

4fd14dae

10 Nov, 2018 1 commit
- Add AppData file · 88d5faac
  Yuri Chornoivan authored Nov 10, 2018
  
  88d5faac
10 Oct, 2018 1 commit

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

Script Kiddy authored Oct 10, 2018

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"

f68fb369

03 Sep, 2018 1 commit

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

Script Kiddy authored Sep 03, 2018

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"

b69269fb

02 May, 2018 1 commit

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

Script Kiddy authored May 02, 2018

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"

05143a07

08 Feb, 2018 1 commit

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

Script Kiddy authored Feb 08, 2018

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"

5463eef1

20 Nov, 2017 1 commit

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

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

03574124

22 Oct, 2017 1 commit
- It's already done in kaboutdata · f75b0af1
  Laurent Montel authored Oct 22, 2017
  
  f75b0af1
27 Sep, 2017 1 commit

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

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

4f18d4a9

15 Sep, 2017 1 commit

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

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

aea57952

04 Sep, 2017 1 commit

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

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"

36f54533

30 Jul, 2017 1 commit

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

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"

082f09d5

27 Jul, 2017 1 commit

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

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"

70248795

15 Jul, 2017 1 commit
- Merge remote-tracking branch 'origin/Applications/17.04' · 6cb99b1d
  Luigi Toscano authored Jul 15, 2017
  
  6cb99b1d
04 Jul, 2017 1 commit

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

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"

95cc31ac

01 Jun, 2017 1 commit
- Use Q_DECLARE_OVERRIDE · 66e06ff4
  Laurent Montel authored Jun 01, 2017
  
  66e06ff4
30 May, 2017 2 commits

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

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"

e477263b

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

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"

27e646f1

24 May, 2017 2 commits

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

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"

92c0b030

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

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"

a209b4d3

26 Mar, 2017 1 commit

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

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"

2c5f1d96

23 Mar, 2017 1 commit

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

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

e95230a2