[glade3/offscreen: 3/3] Merge branch 'master' into offscreen

[Tristan Van Berkom <tvb src gnome org>]

commit 305e44f087b2f79eae5dd109f7af3123d3ef43ca
Merge: f671dd0 0b6f713
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Tue Oct 12 17:53:14 2010 +0900

    Merge branch 'master' into offscreen

 ChangeLog                 |   23 ++++
 gladeui/.gitignore        |    2 +
 gladeui/Makefile.am       |   39 +++++++-
 gladeui/glade-app.c       |   13 +++
 gladeui/glade-app.h       |    2 +
 gladeui/glade-inspector.c |   22 ++--
 gladeui/glade-project.c   |  247 ++++++++++++++++++++++++++++++++++++++++++++-
 gladeui/glade-project.h   |    8 +-
 gladeui/glade-xml-utils.c |   16 +++
 gladeui/glade-xml-utils.h |    3 +
 plugins/gtk+/glade-gtk.c  |   10 ++-
 plugins/gtk+/gtk+.xml.in  |    1 +
 src/glade-window.c        |   87 ++++++++++++++++-
 13 files changed, 451 insertions(+), 22 deletions(-)
---