Viewing all changes in revision 2437.7.3.
- Committer: Jeremy Wootten
- Date: 2017-02-04 12:33:41 UTC
- mfrom: (2437.8.1 enable-testing-ctest-part3)
- mto: This revision was merged to the branch mainline in revision 2492.
- Revision ID: jeremy@elementaryos.org-20170204123341-iu0mack8ie84qwj0
Merge updates from parent and resolve conflict
- files added:
- po/extra/id.po
- files removed:
- src/marlin-icon-renderer.c
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
