Viewing all changes in revision 2373.
- Committer: Jeremy Wootten
- Date: 2017-06-05 14:48:38 UTC
- mfrom: (2367.1.205 pantheon-files)
- Revision ID: jeremy@elementaryos.org-20170605144838-ngoqzv21tivcgmx8
Merge trunk to r2572 and resolve conflict
- files added:
- data/pantheon-files-filemanager1.service.cmake
- libcore/tests/GOFDirectoryAsyncTests
- libcore/tests/GOFFileTests
- libcore/tests/MarlinIconInfoTests
- libcore/tests/UtilTests
- files removed:
- libcore/tests/Makefile.am
- files renamed:
- data/net.launchpad.pantheon-files.policy.cmake => data/net.launchpad.pantheon-files.policy.xml.in.in
- files modified:
- AUTHORS
- data/pantheon-files-pkexec.cmake *
- plugins/contractor/contractor.plug *
- plugins/network-places/network-places.plug *
- plugins/pantheon-files-ctags/pantheon-files-ctags.plug *
- plugins/pantheon-files-trash/pantheon-files-trash.plug *
expand all
collapse all
added
removed
