Merge lp:~gothicx/entertainer/change_gnomexfce into lp:entertainer

[Marco Rodrigues]

[Matt Layman (mblayman)]

I understand that this is subtlely different from the your other merge proposal for this branch (0.3 vs trunk as the target), but I think that you don't need to provide this level of effort in the future.

If a branch is approved for merging into somthing other than the trunk, it will either be merged onto that release (or subsequent point release) or we'll merged it on to the trunk shortly after. For example, we might not merge the branch onto a release branch if it doesn't fix a critical bug right shortly before release, but if we approve it, you can be pretty certain that we'll merge it onto trunk.

Thanks for being thorough though.

review: Disapprove

[Marco Rodrigues (gothicx)]

Hi!

Ah ok. So when I do a push, it proposees automatically to the trunk (current development), or I need to propose the merge ?

Thanks

[Marco Rodrigues (gothicx)]

You'll apply this change to the trunk, or I need to propose it again, but now against trunk ?

Unmerged revisions