Viewing all changes in revision 3303.

Committer: timo.jyrinki at canonical
Date: 2012-09-19 12:18:34 UTC
mfrom: <a title="Merged From 3248.78.71" href="/~nabil-stendardo/ubuntu/quantal/compiz/fix-segfault-related-to-shaders-and-uniforms/revision/3248.78.71">(3248.78.71 compiz.fix-build-gles-19092012)
Revision ID: timo.jyrinki@canonical.com-20120919121834-itx4n174cphcwdmz

* Cherry-pick fixes from trunk:
- Fix FTBFS with BUILD_GLES

added added

removed removed