Merge branch 'master' into gsoc18-exporttools-o2
Description
Description
Details
Details
- Committed
mqualmann Jun 20 2018, 5:39 PM - Parents
- R482:7b6f8b269a9f: fix merge conflict in NEWS
R482:90f99fa95ce7: fix merge conflict in NEWS - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 90f99fa95ce7 | mqualmann | fix merge conflict in NEWS | Jun 20 2018 | |||
| b62539aea69c | mqualmann | add manualOrder column to the database migration process | Jun 20 2018 | |||
| c5835d5deb01 | mqualmann | enable database update to V10 | Jun 20 2018 | |||
| 2501c88c7ed9 | mqualmann | merge changes to dbconfig.xml from gsoc18-iconview-sort branch | Jun 20 2018 | |||
| 3cfdf18e8ce6 | mqualmann | replace one QString char with QChar and polish | Jun 18 2018 | |||
| 6b02adcc6901 | mqualmann | polish | Jun 18 2018 | |||
| 530513c8e5fb | mqualmann | replace one QString char with QChar | Jun 18 2018 | |||
| b0d573466420 | mqualmann | polish | Jun 18 2018 | |||
| fcaee6db57fe | mqualmann | enable checkbox for export tags from host application BUGS: 395579 FIXED-IN: 6. | Jun 18 2018 | |||
| a196c917f241 | mqualmann | revert a change from "polish and use reference" | Jun 18 2018 | |||
| 9d943f30e61d | mqualmann | prepare database update to V10 | Jun 18 2018 | |||
| b06c02619390 | mqualmann | polish | Jun 18 2018 | |||
| 98c220b6c18d | mqualmann | update | Jun 18 2018 |