mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-11-10 20:13:24 -08:00
Conflict resolution: keep both the tag database and the upstream database writer in the oracle test targets and both includes in the importer test; restore the tags.svg resource entry that the rerere replay dropped. Upstream's icon rules also landed mid-branch: use loadThemedIcon() for the tag quick-filter button and re-author tags.svg as a 24x24 currentColor icon so IconAssets.AssetsFollowTheRules passes. |
||
|---|---|---|
| .. | ||
| resources | ||
| src | ||
| translations | ||
| CMakeLists.txt | ||
| oracle.desktop | ||
| oracle.qrc | ||
| oracle.rc | ||
| oracle_en@source.ts | ||