lp:~marcus-lundgren/pantheon-files/fix-1011672

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~elementary-apps/pantheon-files/trunk at revision 846

Jaap Broekhuizen (community): Approve on 2012-06-11

Diff: 18 lines (+0/-3)

1 file modified

data/pantheon-files.desktop.in (+0/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1011672: Error Plank - Pantheon files

High

Fix Released

Link a bug report

Related blueprints

846. By Marcus Lundgren on 2012-06-11

Removed invalid strings from pantheon-files.desktop.in.

845. By Mario Guerriero on 2012-06-11

merged with latest marlin

844. By xapantu on 2012-06-03

Sync from marlin, change the schemas back to the original marlin ones.
Please do sudo rm /usr/local/share/glib-2.0/schemas/org.pantheon.files.gschema.xml before reinstalling it.

843. By Mario Guerriero on 2012-06-03

fixed bug #1007817

842. By Mario Guerriero on 2012-06-03

Dropped default file manager option from preferences dialog. Fixed bug #1005755

841. By Mario Guerriero on 2012-06-02

Renamed some classes in contractor plugin to avoid crashing at start. Fixed bug #1007788

840. By xapantu on 2012-06-02

Merge with marlin: LocationBar improvements

839. By xapantu on 2012-06-01

Back to the original extended-actions, add contractor plugin separately

838. By xapantu on 2012-06-01

Merge ttosttos's branch: translation stuff

837. By xapantu on 2012-05-31

Revert rebranding, it caused some bugs (#1006397) and is useless since it is not visible by the user. Keep things simple.