compiz: Changes to 'master'

[Mike Dransfield]

 include/compiz.h |   15 ++--
 plugins/scale.c  |    2 
 src/display.c    |    4 -
 src/event.c      |    6 -
 src/screen.c     |  169 +++++++++++++++++++++++++++----------------------------
 src/window.c     |    2 
 6 files changed, 101 insertions(+), 97 deletions(-)

New commits:
commit 1ba2f412bafcb6fd9433ac8819ebbe2b91eaecf8
Author: mike at blueroot.co.uk <mike at blueroot.co.uk>
Date:   Sat Jan 27 20:52:38 2007 +0000

    Allow plugins to wrap enter/leaveShowDesktopMode