[clutter-gtkmm: 3/3] Resolved merge

[Murray Cumming <murrayc src gnome org>]

commit 03cc751bcb3d254871efd107e100543b86e2e179
Merge: 9780e46... 9bb6551...
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Aug 26 13:21:18 2009 +0200

    Resolved merge

 ChangeLog                            |   13 +++----
 clutter-gtk/clutter-gtkmm/utility.cc |   60 +++++++++++++++++++++++++--------
 examples/events/event.cc             |    8 ++--
 3 files changed, 55 insertions(+), 26 deletions(-)
---
diff --cc ChangeLog
index 44bc160,877a32b..18701cd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,17 -1,9 +1,16 @@@
 +2009-08-26  Murray Cumming  <murrayc murrayc com>
 +
 +	Use clutter-gtk-0.10.
 +	
 +	* configure.in: Use clutter-gtk-0.10 instead of clutter-gtk-0.9.
- 	* clutter-gtk/clutter-gtkmm/utility.cc: Handle the new GError parameter for 
- 	gtk_clutter_texture_set_from_pixbuf/stock/icon_name().
 +	* clutter-gtk/clutter-gtkmm.pc.in: Use clutter-gtk-0.10.
++	
+ 2009-07-29  Siavash Safi  <siavashs siavashs org>
  
- 0.9.4:
- 
- 2009-06-25  Murray Cumming  <murrayc murrayc com>
- 
- 	* examples/events/event.cc: Fixed the build with the latest cluttermm.
+ 	* clutter-gtk/clutter-gtkmm/utility.cc: Updated several functions to add
+ 	the GError argument
+ 	* examples/events/event.cc: Updated to build against the new cluttermm
+ 	trunk(patch by Milosz Derezynski)
  
  0.9.3: