Commits · cced90911d99da781d477caf18c307088925c41d · Games / Palapeli

18 Jun, 2020 1 commit

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

Script Kiddy authored Jun 18, 2020

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"

cced9091

17 Jun, 2020 1 commit

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

Script Kiddy authored Jun 17, 2020

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"

3034a89b

29 Mar, 2020 1 commit

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

Script Kiddy authored Mar 29, 2020

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"

98c02f96

22 Sep, 2018 2 commits

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

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

bf07f106

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

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

0e348185

11 Sep, 2017 1 commit

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

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"

c25bd7e3

31 Dec, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · fd692247
  Script Kiddy authored Dec 31, 2014
  
  fd692247
25 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · d41af6a1
  Script Kiddy authored Jul 25, 2014
  
  d41af6a1
24 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 1b619a2a
  Script Kiddy authored Jul 24, 2014
  
  1b619a2a
02 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · a54a8d7c
  Script Kiddy authored Apr 02, 2014
  
  a54a8d7c
24 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · b0bc0992
  Script Kiddy authored Dec 24, 2012
  
  b0bc0992
23 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · d2dfeaf1
  Script Kiddy authored Dec 23, 2012
  
  d2dfeaf1
30 Nov, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · afe19e75
  Script Kiddy authored Nov 30, 2012
  
  afe19e75
10 Sep, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · b1fcd38a
  Script Kiddy authored Sep 10, 2012
  
  b1fcd38a
09 Sep, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · f80238ca
  Script Kiddy authored Sep 09, 2012
  
  f80238ca
07 Aug, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · c3b95f0a
  Script Kiddy authored Aug 07, 2012
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1309655
```
  c3b95f0a
25 Apr, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 4c0aa5dc
  Script Kiddy authored Apr 25, 2012
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1291657
```
  4c0aa5dc
10 Apr, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · f02732fc
  Script Kiddy authored Apr 10, 2012
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1288760
```
  f02732fc
23 Mar, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 85b0d5bf
  Script Kiddy authored Mar 23, 2012
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1286787
```
  85b0d5bf
29 Jan, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · efc4ea60
  Script Kiddy authored Jan 29, 2012
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1276448
```
  efc4ea60
18 Sep, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 24440532
  Script Kiddy authored Sep 18, 2011
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1254220
```
  24440532
11 May, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · b8b03240
  Script Kiddy authored May 11, 2011
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1231361
```
  b8b03240
08 May, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 16b724fa
  Script Kiddy authored May 08, 2011
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1230851
```
  16b724fa
15 Dec, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · ac487723
  Script Kiddy authored Dec 15, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1206621
```
  ac487723
10 Dec, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 71ca7928
  Script Kiddy authored Dec 10, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1205125
```
  71ca7928
03 Dec, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 8fbf84ef
  Script Kiddy authored Dec 03, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1203108
```
  8fbf84ef
22 Nov, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 098140c9
  Script Kiddy authored Nov 22, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1199631
```
  098140c9
28 Aug, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 29bf016f
  Script Kiddy authored Aug 28, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1169030
```
  29bf016f
29 Jun, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 8681ec11
  Script Kiddy authored Jun 29, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1144027
```
  8681ec11
01 Jun, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 3c43adf7
  Script Kiddy authored Jun 01, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1133196
```
  3c43adf7
25 May, 2010 1 commit
- imported palapeli-goldberg-slicer into playground/games/ · 0b8bb45d
  Johannes Loehnert authored May 25, 2010
```
svn path=/trunk/playground/games/palapeli-goldberg-slicer/; revision=1130638
```
  0b8bb45d
21 Mar, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 0c1a0fd2
  Script Kiddy authored Mar 21, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1105707
```
  0c1a0fd2
24 Feb, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · dde60cd1
  Script Kiddy authored Feb 24, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1095459
```
  dde60cd1
05 Feb, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 9796bd0a
  Script Kiddy authored Feb 05, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1085568
```
  9796bd0a
04 Jan, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · 446e75fc
  Script Kiddy authored Jan 04, 2010
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1069852
```
  446e75fc
24 Dec, 2009 1 commit
- SVN_SILENT made messages (.desktop file) · 3d8c3872
  Script Kiddy authored Dec 24, 2009
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1065787
```
  3d8c3872
05 Dec, 2009 1 commit
- SVN_SILENT made messages (.desktop file) · d724238b
  Script Kiddy authored Dec 05, 2009
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1058893
```
  d724238b
01 Dec, 2009 1 commit
- SVN_SILENT made messages (.desktop file) · 072506e4
  Script Kiddy authored Dec 01, 2009
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1057042
```
  072506e4
26 Nov, 2009 1 commit
- SVN_SILENT made messages (.desktop file) · e7712079
  Script Kiddy authored Nov 26, 2009
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1054621
```
  e7712079
25 Nov, 2009 1 commit
- SVN_SILENT made messages (.desktop file) · 26469f87
  Script Kiddy authored Nov 25, 2009
```
svn path=/trunk/KDE/kdegames/palapeli/; revision=1054025
```
  26469f87