diff options
| author | Neil Roberts <neil@openedhand.com> | 2008-04-25 13:37:36 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@openedhand.com> | 2008-04-25 13:37:36 +0000 |
| commit | eff57a1cb0543ef4e172885352db5ba0b14cca2a (patch) | |
| tree | 0bb5f520fb5ff12ec1bb64704478d3512bd149c8 /Makefile.am | |
| parent | b70bf89cedc8399c68e34c5550f3a682d426b3e6 (diff) | |
| download | cogl-eff57a1cb0543ef4e172885352db5ba0b14cca2a.tar.gz | |
Merged clutter-ivan branch into trunk.
svn merge \
https://svn.o-hand.com/repos/clutter/trunk/clutter@2509 \
https://svn.o-hand.com/repos/clutter/branches/clutter-ivan@HEAD
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index f09f6372..9bb6b772 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = $(CLUTTER_COGL) +SUBDIRS = common $(CLUTTER_COGL) EXTRA_DIST = cogl.h |