[gtk+/master.fcw: 129/648] Merge branch 'master' into master.fcw

[Chun-wei Fan <fanchunwei src gnome org>]

commit b42f7a74bf117f4a08297e90cf70fd54fbc9c9fc
Merge: 6af50c0 8ec72dd
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Tue Dec 2 09:27:00 2014 +0800

    Merge branch 'master' into master.fcw

 README.in                                 |    3 +
 build/win32/vs10/gtk-build-defines.props  |    2 +-
 build/win32/vs9/gtk-build-defines.vsprops |    2 +-
 configure.ac                              |   69 ++----
 demos/gtk-demo/Makefile.am                |    2 +-
 demos/widget-factory/Makefile.am          |    2 +-
 docs/reference/gtk/building.sgml          |   18 --
 gdk/mir/gdkmirdisplay.c                   |   74 ++++--
 gtk/Makefile.am                           |  212 ++++++-----------
 gtk/gtkplacessidebar.c                    |    4 +-
 gtk/gtksettings.c                         |    8 +-
 gtk/inspector/inspect-button.c            |   11 +-
 gtk/native/Makefile.am                    |   22 --
 gtk/theme/Adwaita/_common.scss            |   85 ++++---
 gtk/theme/Adwaita/gtk-contained-dark.css  |    6 +-
 gtk/theme/Adwaita/gtk-contained.css       |    6 +-
 gtk/theme/HighContrast/_common.scss       |  368 +++++++++++++++++++++--------
 gtk/theme/HighContrast/_drawing.scss      |  120 +++++++---
 gtk/theme/HighContrast/gtk.css            |  351 +++++++++++++++++++++++-----
 gtk/ui/gtkprintunixdialog.ui              |    4 +-
 20 files changed, 873 insertions(+), 496 deletions(-)
---