Mercurial > minori
comparison CMakeLists.txt @ 231:69f4768a820c
chore: merge divergent branches
| author | Paper <paper@paper.us.eu.org> |
|---|---|
| date | Sat, 13 Jan 2024 09:43:41 -0500 |
| parents | f784b5b1914c |
| children | ff0061e75f0f |
comparison
equal
deleted
inserted
replaced
| 230:2f5a9247e501 | 231:69f4768a820c |
|---|---|
| 87 src/gui/dialog/settings.cc | 87 src/gui/dialog/settings.cc |
| 88 src/gui/dialog/settings/application.cc | 88 src/gui/dialog/settings/application.cc |
| 89 src/gui/dialog/settings/services.cc | 89 src/gui/dialog/settings/services.cc |
| 90 src/gui/dialog/settings/torrents.cc | 90 src/gui/dialog/settings/torrents.cc |
| 91 src/gui/dialog/settings/recognition.cc | 91 src/gui/dialog/settings/recognition.cc |
| 92 src/gui/dialog/settings/library.cc | |
| 92 | 93 |
| 93 # Translate | 94 # Translate |
| 94 src/gui/translate/anime.cc | 95 src/gui/translate/anime.cc |
| 95 src/gui/translate/anilist.cc | 96 src/gui/translate/anilist.cc |
| 96 src/gui/translate/config.cc | 97 src/gui/translate/config.cc |
