Merge branch 'master' into gsoc18-twitter-onedrive
Description
Description
Details
Details
- Committed
mqualmann Jun 20 2018, 5:42 PM - Parents
- R482:90f99fa95ce7: fix merge conflict in NEWS
R482:77906c89c5b5: Merge branch 'master' into gsoc18-twitter-onedrive - 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 | |||
6d7f7d1ed3e0 | mqualmann | polish | Jun 17 2018 | |||
982727c5c923 | mqualmann | fix GCC8 compile warning in qstring.h | Jun 17 2018 | |||
dad0d5d14321 | mqualmann | fix GCC8 compile warning | Jun 17 2018 | |||
6dcc0bf90dc6 | mqualmann | polish | Jun 14 2018 | |||
07124cd797fe | mqualmann | polish and use reference | Jun 14 2018 |