nautilus-elementary

Merge lp://staging/nautilus-elementary/2.30 into lp://staging/nautilus-elementary

  1. nautilus-elementary-2.30
  2. Merge into 2.31+
Proposed by Dadot Mukti
Status: Needs review
Proposed branch: lp://staging/nautilus-elementary/2.30
Merge into: lp://staging/nautilus-elementary
Diff against target: 2905 lines (+2709/-20) (has conflicts)
23 files modified
data/nautilus-home.desktop.in (+0/-14)
debian/changelog (+1993/-0)
debian/compat (+1/-0)
debian/control (+157/-0)
debian/control.in (+152/-0)
debian/copyright (+38/-0)
debian/libnautilus-extension-dev.install (+4/-0)
debian/libnautilus-extension1.install (+1/-0)
debian/menu (+2/-0)
debian/mount-archive.desktop (+10/-0)
debian/mount-archive.desktop.in (+10/-0)
debian/nautilus-data.gconf-defaults (+5/-0)
debian/nautilus-data.install (+8/-0)
debian/nautilus.install (+6/-0)
debian/nautilus.postrm (+15/-0)
debian/nautilus.xpm (+234/-0)
debian/rules (+19/-0)
debian/source_nautilus.py (+15/-0)
debian/watch (+4/-0)
docs/reference/libnautilus-extension/version.xml (+0/-1)
libnautilus-private/nautilus-file-utilities.c (+6/-1)
src/nautilus-application.c (+21/-0)
src/nautilus-places-sidebar.c (+8/-4)
Contents conflict in data/nautilus-autorun-software.desktop.in
Contents conflict in data/nautilus-browser.desktop.in
Contents conflict in data/nautilus-computer.desktop.in
Contents conflict in data/nautilus-file-management-properties.desktop.in
Contents conflict in data/nautilus-folder-handler.desktop.in
Contents conflict in data/nautilus.desktop.in
Conflict adding file debian.  Moved existing file to debian.moved.
Text conflict in libnautilus-private/nautilus-file-utilities.c
Text conflict in src/nautilus-application.c
Text conflict in src/nautilus-places-sidebar.c
To merge this branch: bzr merge lp://staging/nautilus-elementary/2.30
Reviewer Review Type Date Requested Status
elementaryart (old) Pending
Review via email: mp+69895@code.staging.launchpad.net
To post a comment you must log in.

Unmerged revisions

92. By Live session user <elementary@elementary>

backporting many bug fix coming from maverick rev 96+105+106+135+137+138+144 + reverting from /nautilus to /home/elementary/.nautilus - fixing gksu nautilus

91. By ammonkey

fixing old old bug.. segfault in spatial mode

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: