Viewing all changes in revision 2069.
- Committer: Jeremy Wootten
- Date: 2017-01-16 17:55:18 UTC
- mfrom: (2059.7.349 pantheon-files)
- Revision ID: jeremy@elementaryos.org-20170116175518-c5hpkc3tydbioq8c
Merge trunk to r2446 and resolve conflicts
- files added:
- libcore/SoundManager.vala
- po/extra
- src/Dialogs
- src/Utils
- src/View/Widgets
- files removed:
- filechooser-module/LocationBarChooser.vala
- libwidgets/Dialogs
- files renamed:
- data/pantheon-files.appdata.xml => data/org.pantheon.files.appdata.xml.in
- libwidgets/Dialogs/ChooseAppDialog.vala => src/Dialogs/ChooseAppDialog.vala
- src/View/PropertiesWindow.vala => src/Dialogs/PropertiesWindow.vala
- libwidgets/MimeActions.vala => src/Utils/MimeActions.vala
- src/AbstractEditableLabel.vala => src/View/Widgets/AbstractEditableLabel.vala
- libwidgets/View/BreadcrumbsEntry.vala => src/View/Widgets/BreadcrumbsEntry.vala
- src/View/DiskRenderer.vala => src/View/Widgets/DiskRenderer.vala
- libwidgets/View/LocationBar.vala => src/View/Widgets/LocationBar.vala
- src/MultiLineEditableLabel.vala => src/View/Widgets/MultiLineEditableLabel.vala
- src/View/OverlayBar.vala => src/View/Widgets/OverlayBar.vala
- src/ProgressInfoWidget.vala => src/View/Widgets/ProgressInfoWidget.vala
- src/SingleLineEditableLabel.vala => src/View/Widgets/SingleLineEditableLabel.vala
- libwidgets/Chrome/TopMenu.vala => src/View/Widgets/TopMenu.vala
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
