Merge branch 'master' into my-overlay-design

This commit is contained in:
Marina Zhurakhinskaya 2009-06-29 14:40:04 -04:00
commit 2ae89f3b36

View File

@ -36,11 +36,16 @@
</dependencies> </dependencies>
</autotools> </autotools>
<autotools id="gconf" autogenargs="--disable-defaults-service">
<branch repo="git.gnome.org" module="gconf"/>
</autotools>
<autotools id="mutter" autogenargs="--with-clutter"> <autotools id="mutter" autogenargs="--with-clutter">
<branch repo="git.gnome.org" module="mutter"/> <branch repo="git.gnome.org" module="mutter"/>
<dependencies> <dependencies>
<dep package="gir-repository"/> <dep package="gir-repository"/>
<dep package="clutter"/> <dep package="clutter"/>
<dep package="gconf"/>
</dependencies> </dependencies>
</autotools> </autotools>
@ -51,6 +56,7 @@
<dep package="gir-repository"/> <dep package="gir-repository"/>
<dep package="mutter"/> <dep package="mutter"/>
<dep package="gjs"/> <dep package="gjs"/>
<dep package="gconf"/>
</dependencies> </dependencies>
</autotools> </autotools>