[gstreamermm: 2/2] Fixed merge

[Murray Cumming <murrayc src gnome org>]

commit 8618df5070c6938f82b66cc9adcfa60f8e7b1d37
Merge: 4a38b1c... aad7220...
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Aug 1 14:02:21 2009 +0200

    Fixed merge

 ChangeLog                                     |   13 ++++-
 gstreamer/gstreamermm.h                       |    6 ++-
 gstreamer/src/Makefile_list_of_hg.am_fragment |    3 +-
 gstreamer/src/plugin.ccg                      |    5 +-
 gstreamer/src/taglist.ccg                     |    6 +-
 gstreamer/src/taskpool.ccg                    |   68 +++++++++++++++++++++
 gstreamer/src/taskpool.hg                     |   78 +++++++++++++++++++++++++
 7 files changed, 171 insertions(+), 8 deletions(-)
---
diff --cc ChangeLog
index 42bbe0a,74e04d5..313db8b
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,12 -1,14 +1,23 @@@
- 2009-07-30  Murray Cumming  <murrayc murrayc com>
++2009-07-31  Murray Cumming  <murrayc murrayc com>
 +
 +	Tiny comment additions.
 +
 +	* README: Remove the commas from the list of debian modules to make it 
 +	easier to just paste them into an apt-get install line.
 +	* gstreamer/src/element.hg: Added comments about why we don't wrap the 
 +	get/set_name/parent() macros.
 +
+ 2009-07-31  José Alburquerque  <jaalburqu svn gnome org>
+ 
+ 	* gstreamer/src/Makefile_list_of_hg.am_fragment:
+ 	* gstreamer/src/taskpool.ccg:
+ 	* gstreamer/src/taskpool.hg: Added Gst::TaskPool.
+ 
+ 	* gstreamer/gstreamermm.h: Added missing includes.
+ 
+ 	* gstreamer/src/plugin.ccg:
+ 	* gstreamer/src/taglist.ccg: Slot usage corrections.
+ 
  2009-07-30  José Alburquerque  <jaalburqu svn gnome org>
  
  	* gstreamer/src/bin.ccg: