Diffusion digiKam 9468cf587726

fixed the conflict code; add a row in database table Images to store the manual…
9468cf587726
Actions

Authored by yingjieliu on May 25 2018, 11:46 AM.

Description

fixed the conflict code; add a row in database table Images to store the manual sort order

Details

Committed
yingjieliuMay 25 2018, 11:46 AM
Parents
R482:ad9a6388e6f0: Merge branch 'master' of git.kde.org:digikam
Branches
Unknown
Tags
Unknown

Changes (11)

PathPackages
Mcore/app/dragdrop/imagedragdrop.cpp
Mcore/app/items/digikamimageview.cpp
Mcore/app/items/digikamimageview.h
Mcore/app/views/digikamview.cpp
Mcore/data/database/dbconfig.xml.cmake.in
Mcore/libs/database/coredb/coredb.cpp
Mcore/libs/database/coredb/coredb.h
Mcore/libs/database/coredb/coredbfields.h
Mcore/libs/database/engine/dbenginebackend.cpp
Mcore/libs/database/item/imageinfo.cpp
Mcore/libs/database/item/imageinfo.h

R482:9468cf587726

View Options

core/app/dragdrop/imagedragdrop.cpp

Loading...
View Options

core/app/items/digikamimageview.cpp

Loading...
View Options

core/app/items/digikamimageview.h

Loading...
View Options

core/app/views/digikamview.cpp

Loading...
View Options

core/data/database/dbconfig.xml.cmake.in

Loading...
View Options

core/libs/database/coredb/coredb.cpp

Loading...
View Options

core/libs/database/coredb/coredb.h

Loading...
View Options

core/libs/database/coredb/coredbfields.h

Loading...
View Options

core/libs/database/engine/dbenginebackend.cpp

Loading...
View Options

core/libs/database/item/imageinfo.cpp

Loading...
View Options

core/libs/database/item/imageinfo.h

Loading...