[glom: 10/11] Merged

[Murray Cumming <murrayc src gnome org>]

commit 9f6689a4b73513b69c13da38ff2f84452be9af6b
Merge: 6658483... 2c44531...
Author: Murray Cumming <murrayc murrayc com>
Date:   Sat Sep 5 17:15:33 2009 +0200

    Merged

 ChangeLog                                |   51 +++
 glom/application.cc                      |  546 +++++++++++++-----------------
 glom/application.h                       |    7 +-
 glom/bakery/app_withdoc_gtk.cc           |   35 +--
 glom/dialog_connection.cc                |  108 +++----
 glom/dialog_existing_or_new.cc           |   19 +-
 glom/frame_glom.cc                       |  124 ++++---
 glom/frame_glom.h                        |    9 +
 glom/glom.glade                          |   14 +
 glom/libglom/document/bakery/document.cc |    2 +
 glom/utility_widgets/imageglom.cc        |    1 +
 11 files changed, 472 insertions(+), 444 deletions(-)
---