[goffice: 2/2] Merge branch 'goffice-0-7-11'

[Morten Welinder <mortenw src gnome org>]

commit afc43ab5fe621f9879b962fb6089b4e5b78d76a9
Merge: 1deb2d7... d15188b...
Author: Morten Welinder <terra gnome org>
Date:   Mon Aug 31 18:57:32 2009 -0400

    Merge branch 'goffice-0-7-11'
    
    Conflicts:
    	ChangeLog

 ChangeLog       |    4 ++++
 po/ChangeLog    |    4 ++++
 tools/ChangeLog |    4 ++++
 3 files changed, 12 insertions(+), 0 deletions(-)
---
diff --cc ChangeLog
index 8d3d95f,5d27ed6..08d6619
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
 +2009-08-31  Jean Brefort  <jean brefort normalesup org>
 +
 +	* all files: deprecate GOStyle::outline. [#593608]
 +	* goffice/canvas/goc-pixbuf.c (goc_pixbuf_draw): don't display a null sized
 +	pixbuf item.
 +
+ 2009-08-31  Morten Welinder <terra gnome org>
+ 
+ 	* Release 0.7.11
+ 
  2009-08-30  Morten Welinder  <terra gnome org>
  
  	* goffice/canvas/goc-item.c (goc_item_new): Keep track of realize.