GitLab

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"

* Update date and version numbers
* Suitable tags and table improved
* Punctuation fixes

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"

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"

(cherry picked from commit c8e70270)

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"

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"

-Beleaguered Castle
-Citadel
-Exiled Kings
-Streets and Alleys
-Siegecraft
-Stronghold
-Other custom varations via settings

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"

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"

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"

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"

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"

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"

(cherry picked from commit ec196797)

Ace foundation auto moves were crashing after the game type was changed. Now removing PatPile before removing Pile during game type change.

BUG: 436181

(cherry picked from commit 0b070864)

Baker's Game
Eight Off
Forecell
Seahaven Towers
Other custom configurations

GIT_SILENT

(cherry picked from commit 6cf35dc9)

Added Baker's Dozen game type with several subtype variants:

 - Spanish Patience
 - Castles in Spain
 - Portuguese Solitaire
 - Other custom configurations

(cherry picked from commit 810b70b0)