compiz: Changes to 'master'

[Mike Dransfield]

 include/compiz.h |    9 +--------
 src/main.c       |   22 ----------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

New commits:
commit da218f598a5b23678b2eb7213f89d3a82a59aef7
Merge: 2bc24b5... 8d38c0d...
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Jun 6 14:44:52 2007 +0100

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

commit 2bc24b5b8d915be0498a4a6dc18e9eed926222de
Author: Mike Dransfield <mike at blueroot.co.uk>
Date:   Wed Jun 6 14:31:24 2007 +0100

    Remove the N_ macro and windowTypeString