← Back to branch summary

~verzegnassi-stefano/ubuntu-docviewer-app/fix-1524712

~verzegnassi-stefano/ubuntu-docviewer-app/fix-1524712

Viewing all changes in revision 191.2.7.

Committer: Stefano Verzegnassi
Date: 2015-11-22 17:28:09 UTC
mfrom: (202 lo-viewer)
mto: This revision was merged to the branch mainline in revision 207.
Revision ID: stefano92.100@gmail.com-20151122172809-ozk6xf1q0ef7tl2x

Merged 'reboot' - Fixed conflicts

files added:
click

click/CMakeLists.txt

click/com.ubuntu.docviewer.url-dispatcher

click/disable-file-locking.sh

click/disable-file-locking.xcd

click/docviewer-content.json

click/docviewer-libs.json

click/docviewer.apparmor

click/manifest.json.in

po/ar.po

po/bs.po

po/cy.po

po/fo.po

po/shn.po

po/sr.po

po/sv.po

po/ug.po

src/plugin/libreofficetoolkit-qml-plugin/loerror.h

files removed:
click

click/CMakeLists.txt

click/com.ubuntu.docviewer.url-dispatcher

click/docviewer-content.json

click/docviewer-libs.json

click/docviewer.apparmor

click/manifest.json.in

files renamed:
src/app/qml/common/FileNotFoundDialog.qml => src/app/qml/common/ErrorDialog.qml

files modified:
CMakeLists.txt

cmake/modules/Click.cmake

po/am.po

po/ast.po

po/br.po

po/ca.po

po/com.ubuntu.docviewer.pot

po/cs.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/gd.po

po/gl.po

po/hu.po

po/id.po

po/it.po

po/lo.po

po/lv.po

po/nb.po

po/nl.po

po/ny.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ru.po

po/sl.po

po/tr.po

po/uk.po

po/uz.po

po/zh_CN.po

po/zh_TW.po

src/app/qml/loView/LOViewPage.qml

src/app/qml/ubuntu-docviewer-app.qml

src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt

src/plugin/libreofficetoolkit-qml-plugin/config.h

src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp

src/plugin/libreofficetoolkit-qml-plugin/lodocument.h

src/plugin/libreofficetoolkit-qml-plugin/loview.cpp

src/plugin/libreofficetoolkit-qml-plugin/loview.h

src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp

src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml

src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp

src/plugin/libreofficetoolkit-qml-plugin/renderengine.h

src/plugin/libreofficetoolkit-qml-plugin/rendertask.h

src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp

src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h

tools/get-click-deps

Show diffs side-by-side

added added

removed removed

click/CMakeLists.txt

click/CMakeLists.txt

click/com.ubuntu.docviewer.url-dispatcher

click/com.ubuntu.docviewer.url-dispatcher

click/disable-file-locking.sh

click/disable-file-locking.xcd

click/docviewer-content.json

click/docviewer-content.json

click/docviewer-libs.json

click/docviewer-libs.json

click/docviewer.apparmor

click/docviewer.apparmor

click/manifest.json.in

click/manifest.json.in

cmake/modules/Click.cmake

po/com.ubuntu.docviewer.pot

src/app/qml/common/ErrorDialog.qml

src/app/qml/loView/LOViewPage.qml

src/app/qml/ubuntu-docviewer-app.qml

src/plugin/libreofficetoolkit-qml-plugin/CMakeLists.txt

src/plugin/libreofficetoolkit-qml-plugin/config.h

src/plugin/libreofficetoolkit-qml-plugin/lodocument.cpp

src/plugin/libreofficetoolkit-qml-plugin/lodocument.h

src/plugin/libreofficetoolkit-qml-plugin/loerror.h

src/plugin/libreofficetoolkit-qml-plugin/loview.cpp

src/plugin/libreofficetoolkit-qml-plugin/loview.h

src/plugin/libreofficetoolkit-qml-plugin/plugin.cpp

src/plugin/libreofficetoolkit-qml-plugin/qml/Viewer.qml

src/plugin/libreofficetoolkit-qml-plugin/renderengine.cpp

src/plugin/libreofficetoolkit-qml-plugin/renderengine.h

src/plugin/libreofficetoolkit-qml-plugin/rendertask.h

src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.cpp

src/plugin/libreofficetoolkit-qml-plugin/sgtileitem.h

tools/get-click-deps

Older »