zaheer - in flumotion/trunk: . flumotion/component

[flumotion-commit at lists.fluendo.com]

Author: zaheer
Date: Thu May 10 16:50:05 2007
New Revision: 4929

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/Makefile.am
   flumotion/trunk/flumotion/component/component.xml
Log:
	* flumotion/component/Makefile.am:
	* flumotion/component/component.xml:
	Fix distcheck and fix bundling of switch component.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Thu May 10 16:50:05 2007
@@ -1,5 +1,11 @@
 2007-05-10  Zaheer Abbas Merali  <<zaheerabbas at merali dot org>>
 
+	* flumotion/component/Makefile.am:
+	* flumotion/component/component.xml:
+	Fix distcheck and fix bundling of switch component.
+
+2007-05-10  Zaheer Abbas Merali  <<zaheerabbas at merali dot org>>
+
 	* configure.ac:
 	* flumotion/component/combiners/Makefile.am:
 	* flumotion/component/combiners/__init__.py:

Modified: flumotion/trunk/flumotion/component/Makefile.am
==============================================================================
--- flumotion/trunk/flumotion/component/Makefile.am	(original)
+++ flumotion/trunk/flumotion/component/Makefile.am	Thu May 10 16:50:05 2007
@@ -17,6 +17,7 @@
 SUBDIRS = \
 	base \
 	bouncers \
+	combiners \
 	consumers \
 	converters \
 	effects \

Modified: flumotion/trunk/flumotion/component/component.xml
==============================================================================
--- flumotion/trunk/flumotion/component/component.xml	(original)
+++ flumotion/trunk/flumotion/component/component.xml	Thu May 10 16:50:05 2007
@@ -13,6 +13,7 @@
           <filename location="converters/__init__.py" />
           <filename location="encoders/__init__.py" />
           <filename location="muxers/__init__.py" />
+	  <filename location="combiners/__init__.py" />
           <filename location="consumers/__init__.py" />
           <filename location="bouncers/__init__.py" />
           <filename location="effects/__init__.py" />