← Back to branch summary

~jeremywootten/pantheon-files/fix-1604300-merge-find-functionalities-part1

« back to all changes in this revision

Viewing changes to src/Dialogs/VolumePropertiesWindow.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

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Dialogs/VolumePropertiesWindow.vala
1
1
/*
2
2
* Copyright (c) 2011 Marlin Developers (http://launchpad.net/marlin)
3
 
* Copyright (c) 2015-2016 elementary LLC (http://launchpad.net/pantheon-files)
 
3
* Copyright (c) 2015-2017 elementary LLC (http://launchpad.net/pantheon-files)
4
4
*
5
5
* This program is free software; you can redistribute it and/or
6
6
* modify it under the terms of the GNU General Public