Merge lp://qastaging/~junrrein/pantheon-files/fix-1132004-real into lp://qastaging/~elementary-apps/pantheon-files/trunk
Proposed by
Julián Unrrein
| Status: | Merged |
|---|---|
| Merged at revision: | 1129 |
| Proposed branch: | lp://qastaging/~junrrein/pantheon-files/fix-1132004-real |
| Merge into: | lp://qastaging/~elementary-apps/pantheon-files/trunk |
| Diff against target: |
49 lines (+28/-0) (has conflicts) 2 files modified
libcore/gof-directory-async.vala (+18/-0) src/fm-directory-view.c (+10/-0) Text conflict in libcore/gof-directory-async.vala |
| To merge this branch: | bzr merge lp://qastaging/~junrrein/pantheon-files/fix-1132004-real |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cody Garver (community) | Approve | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2013-02-24.
Description of the change
Proper fix to bug #1085662 - that (hopefully) also avoids triggering bug #1132004.
This is means that if this is accepted, both bugs should be marked as fixed.
So check that none of them happen!
To post a comment you must log in.
Revision history for this message
| Cody Garver (codygarver) | # |
review:
Approve
Revision history for this message
| Cody Garver (codygarver) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
