Merge lp://staging/~mc-return/compiz/compiz.merge-plugin-animationjc into lp://staging/compiz/0.9.8
Status: | Superseded |
---|---|
Proposed branch: | lp://staging/~mc-return/compiz/compiz.merge-plugin-animationjc |
Merge into: | lp://staging/compiz/0.9.8 |
Diff against target: |
1369 lines (+1311/-0) 11 files modified
plugins/animationjc/CMakeLists.txt (+7/-0) plugins/animationjc/animationjc.xml.in (+154/-0) plugins/animationjc/compiz-animationjc.pc.in (+12/-0) plugins/animationjc/include/animationjc/animationjc.h (+343/-0) plugins/animationjc/src/animationjc.cpp (+145/-0) plugins/animationjc/src/blackhole.cpp (+79/-0) plugins/animationjc/src/flicker.cpp (+96/-0) plugins/animationjc/src/ghost.cpp (+98/-0) plugins/animationjc/src/popcorn.cpp (+60/-0) plugins/animationjc/src/private.h (+232/-0) plugins/animationjc/src/raindrop.cpp (+85/-0) |
To merge this branch: | bzr merge lp://staging/~mc-return/compiz/compiz.merge-plugin-animationjc |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Daniel van Vugt | Needs Fixing | ||
Sam Spilsbury | Pending | ||
Review via email: mp+110677@code.staging.launchpad.net |
This proposal has been superseded by a proposal from 2013-04-02.
Commit message
Added the unsupported, but fully working plug-in "animationjc" converted from git to bzr (including history) to Compiz 0.9.8.
Description of the change
Adds the unsupported, but fully working plug-in "animationjc" converted from git to bzr (including history) to Compiz 0.9.8.
Unmerged revisions
- 3254. By MC Return
-
Fixed [-Werror=
maybe-uninitial ized] compiler warning for the float 'displacement' - 3253. By MC Return
-
Removed plugins/
animationjc/ VERSION - 3252. By MC Return
-
Added missing PLUGINDEPS composite and opengl to CMakeLists.txt to fix compilation
- 3251. By MC Return
-
Rebased on latest lp:compiz (r3285)
- 3250. By MC Return
-
Added the unsupported, but fully working plug-in "animationjc" converted from git to bzr (including history) to Compiz 0.9.8.
I feel like animationjc and animationextra should probably be merged into either animation or animationaddon. Two less plugins to maintain. Thoughts?