← Back to branch summary

~codygarver/+junk/files-gtk-310

~codygarver/+junk/files-gtk-310

Viewing all changes in revision 1426.

Committer: Cody Garver
Date: 2014-03-31 05:23:16 UTC
mfrom: (1424.1.38 pantheon-files)
Revision ID: cody@elementaryos.org-20140331052316-umzdepuyr30lz0y1

Merge in trunk and resolve conflicts

files added:
icons/poof.png

libcore/AbstractSidebar.vala

libwidgets/PoofWindow.vala

po/km.po

po/ta.po

src/Bookmark.vala

src/BookmarkList.vala

src/View/Sidebar.vala

files removed:
libcore/marlin-abstract-sidebar.c

libcore/marlin-abstract-sidebar.h

src/marlin-bookmark-list.c

src/marlin-bookmark-list.h

src/marlin-bookmark.c

src/marlin-bookmark.h

src/marlin-places-sidebar.c

src/marlin-places-sidebar.h

files modified:
CMakeLists.txt

icons/CMakeLists.txt

libcore/CMakeLists.txt

libcore/gof-callwhenready.vala

libcore/marlin-file-operations.c

libcore/marlin-file-utilities.c

libcore/marlin-file-utilities.h

libcore/marlin-icon-info.c

libcore/marlincore-C.vapi

libcore/marlincore.deps

libcore/marlincore.pc.cmake

libwidgets/CMakeLists.txt

libwidgets/LocationBar.vala

libwidgets/tests/CMakeLists.txt

libwidgets/tests/tests-pathbar.vala

marlin-daemon/CMakeLists.txt

plugins/contractor/CMakeLists.txt

plugins/marlin-ctags/CMakeLists.txt

plugins/marlin-ctags/plugin.vala

plugins/marlin-trash/CMakeLists.txt

plugins/network-places/CMakeLists.txt

po/am.po

po/de.po

po/he.po

po/ko.po

po/lt.po

po/nb.po

po/pl.po

po/pt.po

po/ru.po

po/sk.po

po/sv.po

src/Application.vala

src/CMakeLists.txt

src/QuicklistHandler.vala

src/View/Chrome/ViewSwicher.vala

src/View/DiskRenderer.vala

src/View/PropertiesWindow.vala

src/View/ViewContainer.vala

src/View/Window.vala

src/exo-icon-view.c

src/fm-abstract-icon-view.c

src/fm-columns-view.c

src/fm-directory-view.c

src/fm-icon-view.c

src/fm-list-view.c

src/gof-window-slot.c

src/marlin-icon-renderer.c

src/marlin.vapi

Show diffs side-by-side

added added

removed removed

icons/CMakeLists.txt

libcore/AbstractSidebar.vala

libcore/CMakeLists.txt

libcore/gof-callwhenready.vala

libcore/marlin-abstract-sidebar.c

libcore/marlin-abstract-sidebar.h

libcore/marlin-file-operations.c

libcore/marlin-file-utilities.c

libcore/marlin-file-utilities.h

libcore/marlin-icon-info.c

libcore/marlincore-C.vapi

libcore/marlincore.deps

libcore/marlincore.pc.cmake

libwidgets/CMakeLists.txt

libwidgets/LocationBar.vala

libwidgets/PoofWindow.vala

libwidgets/tests/CMakeLists.txt

libwidgets/tests/tests-pathbar.vala

marlin-daemon/CMakeLists.txt

plugins/contractor/CMakeLists.txt

plugins/marlin-ctags/CMakeLists.txt

plugins/marlin-ctags/plugin.vala

plugins/marlin-trash/CMakeLists.txt

plugins/network-places/CMakeLists.txt

src/Application.vala

src/Bookmark.vala

src/BookmarkList.vala

src/CMakeLists.txt

src/QuicklistHandler.vala

src/View/Chrome/ViewSwicher.vala

src/View/DiskRenderer.vala

src/View/PropertiesWindow.vala

src/View/ViewContainer.vala

src/View/Window.vala

src/exo-icon-view.c

src/fm-abstract-icon-view.c

src/fm-columns-view.c

src/fm-directory-view.c

src/fm-icon-view.c

src/fm-list-view.c

src/gof-window-slot.c

src/marlin-bookmark-list.c

src/marlin-bookmark-list.h

src/marlin-bookmark.c

src/marlin-bookmark.h

src/marlin-icon-renderer.c

src/marlin.vapi

Older »