[libegg/spread-table-dnd: 13/13] Merge branch 'master' into spread-table-dnd

[Murray Cumming <murrayc src gnome org>]

commit a8f0401b59cc070128430303c86ac3e1b0631692
Merge: 86cc2ad 6b18361
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Apr 10 13:45:59 2011 +0200

    Merge branch 'master' into spread-table-dnd

 configure.ac                                    |    2 +-
 libegg/Makefile.am                              |    5 +-
 libegg/datetime/egg-datetime.c                  |    4 +
 libegg/dock/Makefile.am                         |   93 --
 libegg/dock/egg-dock-item-grip.c                |  173 ---
 libegg/dock/egg-dock-item-grip.h                |   55 -
 libegg/dock/egg-dock-item.c                     | 1730 -----------------------
 libegg/dock/egg-dock-item.h                     |  166 ---
 libegg/dock/egg-dock-layout.c                   | 1458 -------------------
 libegg/dock/egg-dock-layout.h                   |   96 --
 libegg/dock/egg-dock-master.c                   |  917 ------------
 libegg/dock/egg-dock-master.h                   |   97 --
 libegg/dock/egg-dock-notebook.c                 |  514 -------
 libegg/dock/egg-dock-notebook.h                 |   61 -
 libegg/dock/egg-dock-object.c                   |  917 ------------
 libegg/dock/egg-dock-object.h                   |  225 ---
 libegg/dock/egg-dock-paned.c                    |  661 ---------
 libegg/dock/egg-dock-paned.h                    |   65 -
 libegg/dock/egg-dock-placeholder.c              |  615 --------
 libegg/dock/egg-dock-placeholder.h              |   69 -
 libegg/dock/egg-dock-tablabel.c                 |  640 ---------
 libegg/dock/egg-dock-tablabel.h                 |   76 -
 libegg/dock/egg-dock.c                          | 1247 ----------------
 libegg/dock/egg-dock.h                          |   99 --
 libegg/dock/layout.glade                        |  290 ----
 libegg/dock/test-dock.c                         |  232 ---
 libegg/fileformatchooser/eggfileformatchooser.c |    5 +
 libegg/smclient/eggdesktopfile.c                |   12 +-
 libegg/smclient/eggsmclient-dbus.c              |    1 -
 libegg/toolbareditor/egg-editable-toolbar.c     |   23 +-
 libegg/treeviewutils/Makefile.am                |   10 +-
 libegg/treeviewutils/egg-cell-renderer-text.c   |  100 ++-
 libegg/treeviewutils/eggcellrendererkeys.c      |   79 +-
 libegg/treeviewutils/eggtreemodelfilter.c       |    6 +-
 libegg/treeviewutils/eggtreeviewstate.c         |    4 +
 libegg/treeviewutils/test-tree-utils.c          |    5 +-
 libegg/wrapbox/Makefile                         |   13 -
 libegg/wrapbox/Makefile.am                      |   55 +
 libegg/wrapbox/eggwrapbox.c                     |    7 +-
 libegg/wrapbox/testwrapbox.c                    |   48 +-
 40 files changed, 272 insertions(+), 10603 deletions(-)
---