metacity r3483 - in trunk: . src

[tthurman svn gnome org]

Author: tthurman
Date: 2007-12-19 03:49:50 +0000 (Wed, 19 Dec 2007)
New Revision: 3483
ViewCVS link: http://svn.gnome.org/viewcvs/metacity?rev=3483&view=rev

Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/c-screen.c
   trunk/src/c-screen.h
   trunk/src/c-window.c
   trunk/src/c-window.h
   trunk/src/compositor.c
   trunk/src/compositor.h
   trunk/src/display.c
   trunk/src/display.h
   trunk/src/screen.c
   trunk/src/screen.h
   trunk/src/theme-parser.c
   trunk/src/theme-viewer.c
   trunk/src/theme.c
   trunk/src/theme.h
   trunk/src/ui.c
   trunk/src/ui.h
Log:
2007-12-18  Iain Holmes  <iain gnome org>

        * configure.in, src/theme.c, src/display.c,
      src/theme.h, src/display.h, src/theme-parser.c,
      src/compositor.c, src/c-screen.c, src/compositor.h,
      src/c-screen.h, src/ui.c, src/screen.c, src/ui.h,
      src/screen.h, src/c-window.c, src/c-window.h,
      src/theme-viewer.c, src/Makefile.am: Merge compositor branch.