OpenGL based compositing and windows manager: Changes to 'master'

[David Reveman]

 include/compiz.h |   26 +++++++++++++-------------
 plugins/gconf.c  |    3 ---
 src/option.c     |    4 ++--
 src/window.c     |    4 ++--
 4 files changed, 17 insertions(+), 20 deletions(-)

New commits:
commit 6ee597aed981c339863064f69d706f528cc2a8ed
Merge: 9614f59... d4a51dd...
Author: David Reveman <davidr at novell.com>
Date:   Tue Jul 18 11:00:41 2006 -0400

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

commit 9614f5902bc4b1a8ee0ee7a66a29ce97a9882db9
Author: Quinn Storm <livinglatexkali at gmail.com>
Date:   Tue Jul 18 10:57:30 2006 -0400

    Fix equality check for action options.

commit f53406139d85816820922318da05e5a9ced0a9ea
Author: David Reveman <davidr at novell.com>
Date:   Tue Jul 18 10:53:02 2006 -0400

    Don't free existingValue in switch statement.

commit 7a60f5118c0dadf6f792e277a7322e18aeecf105
Author: David Reveman <davidr at novell.com>
Date:   Tue Jul 18 10:38:57 2006 -0400

    Fix typo (Alp Toker)