Compiz Core

Merge lp://qastaging/~kees/compiz-core/plasma-point into lp://qastaging/compiz-core/trunk

  1. plasma-point
  2. Merge into trunk
Proposed by Kees Cook
Status: Rejected
Rejected by: Sam Spilsbury
Proposed branch: lp://qastaging/~kees/compiz-core/plasma-point
Merge into: lp://qastaging/compiz-core/trunk
Diff against target: 1313 lines (+1287/-0)
5 files modified
plugins/plasma-point/CMakeLists.txt (+5/-0)
plugins/plasma-point/plasmapoint.xml.in (+77/-0)
plugins/plasma-point/src/firepaint.cpp (+717/-0)
plugins/plasma-point/src/firepaint.h (+265/-0)
plugins/plasma-point/src/firepaint_tex.h (+223/-0)
To merge this branch: bzr merge lp://qastaging/~kees/compiz-core/plasma-point
Reviewer Review Type Date Requested Status
Sam Spilsbury Approve
Review via email: mp+67253@code.qastaging.launchpad.net

Description of the change

Take 2, using the upstream branch instead of the packaging branch...

To post a comment you must log in.
Revision history for this message
Sam Spilsbury (smspillaz) wrote :

Approve though this is the upstream branch, so I'll merge it into lp:compiz-core/oneiric

review: Approve
Revision history for this message
Kees Cook (kees) wrote :

Thanks! I didn't see any code actually published in that branch yet, so I used lp:compiz-core

Revision history for this message
Sam Spilsbury (smspillaz) wrote :

No problem. I'm currently in the middle of setting up all the repos to
sync with git here on launchpad so it might be a day or two before I
can merge this in.

On Sat, Jul 9, 2011 at 3:22 AM, Kees Cook <email address hidden> wrote:
> Thanks! I didn't see any code actually published in that branch yet, so I used lp:compiz-core
> --
> https://code.launchpad.net/~kees/compiz-core/plasma-point/+merge/67253
> You are reviewing the proposed merge of lp:~kees/compiz-core/plasma-point into lp:compiz-core.
>

--
Sam Spilsbury

Unmerged revisions

2762. By Kees Cook

Add plasma-point plugin.

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 all changes: