← Back to branch summary

~jeremywootten/pantheon-files/fix-798470-merge-files-to-folder-by-drag-drop

~jeremywootten/pantheon-files/fix-798470-merge-files-to-folder-by-drag-drop

Viewing all changes in revision 2073.

Committer: Jeremy Wootten
Date: 2017-02-04 13:49:19 UTC
mfrom: (2059.7.373 pantheon-files)
Revision ID: jeremy@elementaryos.org-20170204134919-mwqifywrxod1jtrz

Merge trunk to r2470

files added:
src/Thumbnailer.vala

files removed:
src/marlin-thumbnailer-proxy.h

src/marlin-thumbnailer.c

src/marlin-thumbnailer.h

files modified:
data/schemas/org.pantheon.files.gschema.xml

libcore/gof-directory-async.vala

libcore/gof-file.c

libcore/gof-preferences.vala

po/el.po

po/extra/el.po

po/it.po

src/Application.vala

src/CMakeLists.txt

src/IconRenderer.vala

src/View/AbstractDirectoryView.vala

src/View/AbstractTreeView.vala

src/View/ColumnView.vala

src/marlin.vapi

Show diffs side-by-side

added added

removed removed

data/schemas/org.pantheon.files.gschema.xml

libcore/gof-directory-async.vala

libcore/gof-file.c

libcore/gof-preferences.vala

src/Application.vala

src/CMakeLists.txt

src/IconRenderer.vala

src/Thumbnailer.vala

src/View/AbstractDirectoryView.vala

src/View/AbstractTreeView.vala

src/View/ColumnView.vala

src/marlin-thumbnailer-proxy.h

src/marlin-thumbnailer.c

src/marlin-thumbnailer.h

src/marlin.vapi

Older »