[glade3: 2/2] Fixing merge conflict

[Tristan Van Berkom <tvb src gnome org>]

commit a862f710dba7d50a3fc025676eb5fce6fe6b0ecf
Merge: db2769e... 020ae58...
Author: Tristan Van Berkom <vantr TheBully local>
Date:   Sat Jun 20 11:32:59 2009 -0400

    Fixing merge conflict

 ChangeLog              |    5 +++++
 gladeui/glade-widget.c |    4 ++++
 2 files changed, 9 insertions(+), 0 deletions(-)
---
diff --cc ChangeLog
index 0488133,86bd85f..061c4fd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2009-06-20  Tristan Van Berkom <tvb gnome org>
 +
 +	* plugins/gtk+/gtk+.xml.in: Make GtkMessageDialog texts translatable (bug 586063)
 +
+ 2009-06-18  James Liggett <jrliggett cox net>
+ 	
+ 	* gladeui/glade-widget.c: Make sure that the project view is not 
+ 	NULL in glade_widget_show. (bug 585860)
+ 
  2009-06-15  Tristan Van Berkom <tvb gnome org>
  
  	* plugins/gtk+/gtk+.xml.in: Make assistant page-titles translatable (bug 503146), marked since 2.10 on