« back to all changes in this revision
Viewing changes to src/View/Widgets/ProgressInfoWidget.vala
- Committer: Jeremy Wootten
- Date: 2017-01-13 13:31:06 UTC
- mfrom: (2412.1.32 pantheon-files)
- Revision ID: jeremy@elementaryos.org-20170113133106-v9l164ms13lh3p0a
Merge trunk to r2444 and resolve conflicts
- files added:
- src/Dialogs
- src/Utils
- files removed:
- libwidgets/Chrome/XsEntry.vala
- libwidgets/Dialogs
- files renamed:
- src/View/AbstractPropertiesDialog.vala => src/Dialogs/AbstractPropertiesDialog.vala
- libwidgets/Dialogs/ChooseAppDialog.vala => src/Dialogs/ChooseAppDialog.vala
- src/View/PropertiesWindow.vala => src/Dialogs/PropertiesWindow.vala
- src/View/VolumePropertiesWindow.vala => src/Dialogs/VolumePropertiesWindow.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:
- data/org.pantheon.files.appdata.xml.in
added
removed
src/View/Widgets/ProgressInfoWidget.vala
