lp://qastaging/~bryanfritt/compiz/more_ezoom_and_100percent_grid

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://qastaging/compiz/0.9.13 at revision 4075

Compiz Maintainers: Pending requested 2016-07-14

Diff: 627 lines (+408/-116)

4 files modified

plugins/ezoom/ezoom.xml.in (+191/-22)
plugins/ezoom/src/ezoom.cpp (+110/-20)
plugins/ezoom/src/ezoom.h (+16/-3)
plugins/grid/src/grid.cpp (+91/-71)

api

Rejected for merging into lp://qastaging/compiz/0.9.12

Compiz Maintainers: Pending requested 2016-06-27

Diff: 2917 lines (+1136/-630)

42 files modified

VERSION (+1/-1)
debian/changelog (+22/-0)
debian/compiz-dev.install (+1/-0)
debian/compiz-gnome.install (+1/-1)
debian/compiz-plugins.install (+2/-0)
debian/compiz-plugins.install.armel (+2/-0)
debian/compiz-plugins.install.armhf (+2/-0)
debian/compizconfig (+5/-0)
debian/unity-lowgfx.ini (+44/-0)
plugins/CMakeLists.txt (+0/-1)
plugins/animation/include/animation/animeffect.h (+5/-2)
plugins/animation/include/animation/grid.h (+0/-1)
plugins/animation/include/animation/multi.h (+19/-9)
plugins/animation/src/animation.cpp (+17/-24)
plugins/animation/src/glide.cpp (+1/-1)
plugins/animation/src/grid.cpp (+0/-6)
plugins/animation/src/private.h (+1/-1)
plugins/animationaddon/CMakeLists.txt (+1/-4)
plugins/animationaddon/include/animationaddon/animationaddon.h (+17/-11)
plugins/animationaddon/src/airplane.cpp (+47/-36)
plugins/animationaddon/src/animationaddon.cpp (+2/-2)
plugins/animationaddon/src/dissolve.cpp (+11/-2)
plugins/animationaddon/src/particle.cpp (+52/-40)
plugins/animationaddon/src/polygon.cpp (+259/-250)
plugins/animationaddon/src/private.h (+3/-2)
plugins/composite/src/privates.h (+2/-9)
plugins/composite/src/window.cpp (+11/-45)
plugins/expo/expo.xml.in (+5/-1)
plugins/expo/src/expo.cpp (+12/-4)
plugins/ezoom/ezoom.xml.in (+191/-22)
plugins/ezoom/src/ezoom.cpp (+110/-20)
plugins/ezoom/src/ezoom.h (+16/-3)
plugins/grid/src/grid.cpp (+112/-93)
plugins/opengl/include/opengl/matrix.h (+27/-0)
plugins/opengl/include/opengl/opengl.h (+6/-0)
plugins/opengl/include/opengl/vertexbuffer.h (+20/-2)
plugins/opengl/src/paint.cpp (+1/-10)
plugins/opengl/src/privatevertexbuffer.h (+6/-2)
plugins/opengl/src/vertexbuffer.cpp (+77/-22)
plugins/opengl/src/window.cpp (+15/-0)
plugins/scale/scale.xml.in (+5/-0)
plugins/scale/src/scale.cpp (+5/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1201061: There should be more zoom levels in 'Specific Zoom'.	Wishlist	Fix Released
Bug #1591737: The 'Grid' plugin should include 100% widths in it's 'Cycle Through Multiple Sizes'.	Undecided	Fix Released

Link a bug report

Related blueprints

4060. By BryanFRitt on 2016-07-28

implemented some formatting changes suggested by Marco Trevisan (Treviño) (3v1n0)

4059. By BryanFRitt on 2016-07-14

ran `bzr merge lp:compiz`

4058. By BryanFRitt on 2016-07-01

rolled back the .bzrignore file
bzr revert .bzrignore --revision 4053
an attept make it say that I didn't modify the file

4057. By BryanFRitt on 2016-07-01

added newline to .bzr-repo
to revert it to what it was before I messed with it.

4056. By BryanFRitt on 2016-07-01

set .bzrignore back to saying '.bzr-repo'

4055. By BryanFRitt on 2016-07-01

reformated changed lines using the "Compiz Development/ CodingStyle"
http://wiki.compiz.org/Development/CodingStyle

4054. By BryanFRitt on 2016-06-12

indentation changes, and added a comment about relatively prime numbers

4053. By BryanFRitt on 2016-06-12

new branch with
old 'ezoom' plugin change that added more zoom levels and
new 'grid' plugin change that added 100% to the sizes that 'Cycle Through Multiple Sizes' goes through

4052. By CI Train Bot Account on 2016-06-06

Releasing 1:0.9.12.2+16.10.20160606.2-0ubuntu1

4051. By Eleni Maria Stea on 2016-06-06

removed a line that includes a missing header file and breaks the build