← Back to branch summary

~fboucault/camera-app/fullscreen_staged_only

~fboucault/camera-app/fullscreen_staged_only

Viewing all changes in revision 647.

Committer: Florian Boucault
Date: 2016-02-23 11:47:53 UTC
mfrom: (639.1.13 staging)
Revision ID: florian.boucault@canonical.com-20160223114753-cockzlxh1c2kk3dh

Merged from staging

files added:
CameraApp/storagelocations.cpp

CameraApp/storagelocations.h

PictureReview.qml

ProcessingFeedback.qml

po/aa.po

po/eo.po

files removed:
CameraApp/qstorageinfo.cpp

CameraApp/qstorageinfo.h

CameraApp/qstorageinfo_p.h

CameraApp/qstorageinfo_unix.cpp

Snapshot.qml

files modified:
BottomEdgeIndicators.qml

CameraApp/CMakeLists.txt

CameraApp/components.cpp

CameraApp/storagemonitor.cpp

CameraApp/storagemonitor.h

GalleryView.qml

PhotogridView.qml

SlideshowView.qml

ViewFinderExportConfirmation.qml

ViewFinderOverlay.qml

ViewFinderOverlayLoader.qml

ViewFinderView.qml

camera-app.qml

cameraapplication.cpp

cameraapplication.h

po/am.po

po/ar.po

po/ca.po

po/cs.po

po/de.po

po/en_AU.po

po/en_GB.po

po/fa.po

po/fi.po

po/gd.po

po/it.po

po/nb.po

po/pl.po

po/pt.po

po/sl.po

po/sr.po

po/sv.po

po/uk.po

po/zh_CN.po

tests/unittests/qstorageinfo_stub.cpp

Show diffs side-by-side

added added

removed removed

BottomEdgeIndicators.qml

CameraApp/CMakeLists.txt

CameraApp/components.cpp

CameraApp/qstorageinfo.cpp

CameraApp/qstorageinfo.h

CameraApp/qstorageinfo_p.h

CameraApp/qstorageinfo_unix.cpp

CameraApp/storagelocations.cpp

CameraApp/storagelocations.h

CameraApp/storagemonitor.cpp

CameraApp/storagemonitor.h

GalleryView.qml

PhotogridView.qml

PictureReview.qml

ProcessingFeedback.qml

SlideshowView.qml

ViewFinderExportConfirmation.qml

ViewFinderOverlay.qml

ViewFinderOverlayLoader.qml

ViewFinderView.qml

cameraapplication.cpp

cameraapplication.h

tests/unittests/qstorageinfo_stub.cpp

Older »