compiz: Changes to 'master'

[Danny Baumann]

 src/screen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ece43e4e476dac1f539f6c9a69ff2ced6d6f1e78
Merge: 93d8d8b5c091ccd68f6e4148886375865e7f556c 868bb7286ac6834ac5b5596bec92bd9f6e676322
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Nov 1 18:46:17 2007 +0100

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

commit 93d8d8b5c091ccd68f6e4148886375865e7f556c
Author: Danny Baumann <dannybaumann at web.de>
Date:   Thu Nov 1 18:45:42 2007 +0100

    Compare to wmType, not type variable.
    Docks that have below state flag shouldn't be hidden in showdesktop mode, so we have to have a look at the real window type.