Fix merge conflict
Description
Description
Details
Details
- Provenance
lynorian Authored on Oct 20 2022, 6:15 PM lynorian Pushed on Oct 20 2022, 6:16 PM - Parents
- rMANUAL9eba6690141c: Spellcheck lximage from cramming the last of the prefrences in
rMANUAL616758c8a23c: Add workaround for Libreoffice translation bug link thanks Arraybolt3 - Branches
- Unknown
- Tags
- Unknown
- References
- stable
Event Timeline
lynorian committed rMANUAL6bfe379c59dd: Fix merge conflict (authored by lynorian).Oct 20 2022, 6:15 PM2022-10-20 18:15:56 (UTC+0)
Merged Changes
Merged Changes
This commit merges a very large number of changes. Only the first 50 are shown.
- b54c11576b14 Update download by zsync linkAuthor
- de9ee5ad02cf 22.10ify hash checkingAuthor
- 2d0bd7fcd4ce Update lximage-shortcut-pref.pngAuthor
- b58d7354f2d8 Add lximage-pref-image screenshotAuthor
- b0589bdf6068 Add Fit images checkboxesAuthor
- 6933c25d12bd Add show menu by default checkboxAuthor
- 889b7e4a7c4a Add Exif data checkboxAuthor
- 1ea01c7f296d Fix general tab summaryAuthor
- 43e5cc9491b2 Fix original size wordingAuthor
- b10d0502ad37 Fix wording on original sizeAuthor
- 0643f4cda1ee Add toggle log buttonAuthor
- b176c9278ee7 Update installer_screen.pngAuthor
- 201213629db4 Add note on summary screenAuthor
- 69ada92c90e0 Update user_setup.pngAuthor
- 0d5470269367 Update keyboard.pngAuthor
- 0e8f3b227380 Update location.png in installerAuthor
- 9994ad216592 Add menu to launch the installerAuthor
- a5fe24ce734e 22.10ify install desktop iconAuthor
- 4f565c222340 Update live_session.pngAuthor
- 19086db1bc06 Update live_session.pngAuthor
- aa216b6975bf Add rename a file to lximageAuthor
- 5546746ea012 update libreoffice_writer.pngAuthor
- 8e0e6f20715c Add lowriter paragraph screenshotAuthor
- 25d4b86335a5 Update writer-save.pngAuthor
- a3a33dbbf4f5 Update math-saveAuthor
- a7f049ad7b20 Update slideshowprop screenshotAuthor
- 3a29ce2e9eca Update impress-save.pngAuthor
- 8ab3e10593ff Update chart window screenshotAuthor
- 9b54ec822237 Fix widget addAuthor
- 49be8a27e838 Fix spelling of partitionAuthor
- c39a2ff65ddf Add delete note toolbar buttonAuthor