[gtk+/treeview-refactor: 642/642] Merge branch 'master' into treeview-refactor

[Tristan Van Berkom <tvb src gnome org>]

commit 7b61cd8257cd73870606d130eba96f4c408f4da4
Merge: 0d78698 d351b40
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date:   Sun Dec 5 13:14:39 2010 +0900

    Merge branch 'master' into treeview-refactor

 docs/reference/gtk/tmpl/gtkenums.sgml       |   48 +++++++++++++++++++++++++++
 docs/reference/gtk/tmpl/gtkiconfactory.sgml |   11 ++++++
 docs/reference/gtk/tmpl/gtkicontheme.sgml   |   12 +++++++
 gdk/gdk.symbols                             |    2 +-
 gdk/gdkwindow.c                             |    2 +-
 gtk/gtkcombobox.c                           |    6 +++
 gtk/gtkentry.c                              |   18 ++++++++++
 gtk/gtkentryprivate.h                       |    4 ++
 gtk/gtkmodifierstyle.c                      |   21 +++++++----
 gtk/gtkmodifierstyle.h                      |    2 +-
 gtk/gtkwidget.c                             |   23 ++++++++++--
 gtk/gtkwidget.h                             |    4 +-
 tests/testgrid.c                            |    2 +-
 13 files changed, 137 insertions(+), 18 deletions(-)
---