[dia/dia-0-96] [merged from git diff {0324dff, d5ca7c7} > rev-3735.diff]

[Hans Breuer <hans src gnome org>]

commit cec58443c403b1a79d0f27912c5d28b7a3c04043
Author: Hans Breuer <hans breuer org>
Date:   Mon Apr 13 14:56:35 2009 +0200

    [merged from git diff {0324dff,d5ca7c7} > rev-3735.diff]
    
    2007-08-05  Hans Breuer  <hans breuer org>
    
    * objects/Misc/analog_clock.c : remove stray PROP_STD_NOTEBOOK_END,
      fixing bug #444749
---
 ChangeLog                   |    8 +++++++-
 objects/Misc/analog_clock.c |    1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 646944e..5e17295 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,12 +17,18 @@
 	* lib/diagdkrenderer.c dia_image.[ch] : don't use dia_image_draw()
 	for up-scaling of images to reduce memory consumption (bug #439885)
 
-[git diff {3deeb43,8afe7b0} > rev-3832.diff]
+[merged from git diff {3deeb43,8afe7b0} > rev-3832.diff]
 2007-10-27  Hans Breuer  <hans breuer org>
 
 	* app/diagram.c(diagram_load) : don't kill the default diagram on 
 	import failure. Fixes bug #490546
 
+[merged from git diff {0324dff,d5ca7c7} > rev-3735.diff]
+2007-08-05  Hans Breuer  <hans breuer org>
+
+	* objects/Misc/analog_clock.c : remove stray PROP_STD_NOTEBOOK_END,
+	fixing bug #444749
+
 2008-03-16  Hans Breuer  <hans breuer org>
 
 	* lib/libdia.def : added missing exports
diff --git a/objects/Misc/analog_clock.c b/objects/Misc/analog_clock.c
index 4367e7b..28f45d8 100644
--- a/objects/Misc/analog_clock.c
+++ b/objects/Misc/analog_clock.c
@@ -144,7 +144,6 @@ static PropDescription analog_clock_props[] = {
   { "show_ticks", PROP_TYPE_BOOL, PROP_FLAG_VISIBLE,
     N_("Show hours"), NULL, NULL },
   
-  PROP_STD_NOTEBOOK_END,
   {NULL}
 };