Merge lp://staging/~bregma/compiz/lp-269904-trusty into lp://staging/compiz/0.9.11
Proposed by
Stephen M. Webb
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Christopher Townsend | ||||
Approved revision: | 3871 | ||||
Merged at revision: | 3871 | ||||
Proposed branch: | lp://staging/~bregma/compiz/lp-269904-trusty | ||||
Merge into: | lp://staging/compiz/0.9.11 | ||||
Diff against target: |
819 lines (+622/-5) 8 files modified
debian/changelog (+24/-0) debian/patches/100_workaround_virtualbox_hang.patch (+4/-4) plugins/opengl/include/opengl/opengl.h (+64/-0) plugins/opengl/include/opengl/xtoglsync.h (+99/-0) plugins/opengl/opengl.xml.in (+5/-0) plugins/opengl/src/privates.h (+13/-0) plugins/opengl/src/screen.cpp (+219/-1) plugins/opengl/src/xtoglsync.cpp (+194/-0) |
||||
To merge this branch: | bzr merge lp://staging/~bregma/compiz/lp-269904-trusty | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Christopher Townsend (community) | Approve | ||
Review via email:
|
Commit message
Use the GL_EXT_
Description of the change
Use the GL_EXT_
Cherry-picked for backport from COmpiz 0.9.12.
To post a comment you must log in.
HOW COULD THIS POSSIBLY HAVE A CONFLICT IN debian/ changelog? ????