[goocanvasmm: 3/3] Fixed merge

[Murray Cumming <murrayc src gnome org>]

commit 00ef7c09b4e3a42936607440143261cc13bb4816
Merge: 3a704be... 92c637f...
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Jul 5 20:54:17 2009 +0200

    Fixed merge

 ChangeLog              |    5 +++++
 goocanvas/src/item.ccg |    2 ++
 goocanvasmm.doap       |   20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 0 deletions(-)
---
diff --cc ChangeLog
index 51404cb,0688dd0..192f2b0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,8 +1,29 @@@
 +2009-07-05  Murray Cumming  <murrayc murrayc com>
 +
 +	Fix the build with the normal API again, and fix some whitespace.
 +
 +2009-07-05  Murray Cumming  <murrayc murrayc com>
 +
 +	Fix the build with disabled 
 +	exceptions and disabled properties API. It is not pretty. 
 +
 +	* examples/coordinates/window.cc:
 +	* examples/custom_item/examplewindow.cc:
 +	* examples/demo/primitives.cc:
 +	* examples/drag_to_canvas/examplewindow.cc:
 +	* examples/moving_shapes/window.cc:
 +	* examples/simple/examplewindow.cc:
 +	* examples/table/examplewindow.cc:
 +	* examples/tablemodel/examplewindow.cc:
 +	* examples/text/window.cc:
 +	* goocanvas/src/polyline.ccg:
 +	* goocanvas/src/polylinemodel.ccg: Added ifdefs.
 +
+ 2009-05-18  Murray Cumming  <murrayc murrayc com>
+ 
+ 	* goocanvas/src/item.ccg: Item_Class::get_items_at_vfunc_callback():
+ 	Added a return 0 to avoid a compiler warning. Bug #582996 (Vincent Untz)
+ 
  0.14.0:
  
  2009-03-25  Murray Cumming  <murrayc murrayc com>