summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorIain Holmes <iain@gnome.org>2007-12-19 03:49:50 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2007-12-19 03:49:50 +0000
commitc2a6eeaf5e543ab987be15fe20fd8c1c9193fa21 (patch)
tree2184095d27aab1e18375f576e49af26a388ccb2a /src/Makefile.am
parent931d70d87f3306b9fc095d3ab2b5b4383dcd52d3 (diff)
downloadmetacity-c2a6eeaf5e543ab987be15fe20fd8c1c9193fa21.tar.gz
metacity-c2a6eeaf5e543ab987be15fe20fd8c1c9193fa21.tar.bz2
Merge compositor branch.
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. svn path=/trunk/; revision=3483
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bfcbef5..0f1bb95 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,10 +12,6 @@ metacity_SOURCES= \
boxes.h \
boxes.c \
common.h \
- c-screen.c \
- c-screen.h \
- c-window.c \
- c-window.h \
compositor.c \
compositor.h \
constraints.c \