compiz: Changes to 'master'

[Mike Dransfield]

 include/cube.h |    4 ++--
 plugins/cube.c |   46 +++++++++++++++++++++++-----------------------
 2 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 97cefbc9ef1d2afa60c9b0f2c14d19c5978d0f20
Merge: 714831c... f5aae26...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Sat Jun 9 12:13:50 2007 +0100

    Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/app/compiz

commit 714831cf2dc4b929bb9a4f98a55b5decefb780f5
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Sat Jun 9 12:12:25 2007 +0100

    Use consistent variable naming conventions