[gtk+/master.fcw: 153/648] Merge branch 'master' into master.fcw
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/master.fcw: 153/648] Merge branch 'master' into master.fcw
- Date: Wed, 4 Feb 2015 05:05:54 +0000 (UTC)
commit 6fd726b303d8ed1a07abd7b236db71ba186b78d7
Merge: 265d67e 3d4bcf5
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Dec 4 15:29:48 2014 +0800
Merge branch 'master' into master.fcw
demos/icon-browser/window.ui | 6 +-
docs/reference/gdk/gdk3-sections.txt | 6 +-
docs/reference/gtk/getting_started.xml | 5 +-
docs/reference/gtk/gtk3-sections.txt | 5 +
examples/README | 12 ++
examples/action-namespace.c | 4 +-
examples/application1/Makefile.example | 20 ++++
examples/application2/Makefile.example | 24 ++++
examples/application3/Makefile.example | 24 ++++
examples/application4/Makefile.example | 24 ++++
examples/application5/Makefile.example | 33 ++++++
examples/application6/Makefile.example | 33 ++++++
examples/application7/Makefile.example | 33 ++++++
examples/application8/Makefile.example | 33 ++++++
examples/application9/Makefile.example | 33 ++++++
examples/bp/bloatpad.c | 31 +++---
gdk/gdkgl.c | 9 +-
gtk/gtkcssshadowvalue.c | 13 +-
gtk/gtkpopover.c | 57 +++++++---
gtk/gtkroundedbox.c | 47 ++++++++
gtk/gtkroundedboxprivate.h | 10 ++
gtk/gtktextattributes.c | 12 ++-
gtk/gtktextattributes.h | 6 +-
gtk/gtktextbuffer.c | 179 ++++++++++++++++++++++++++++++
gtk/gtktextbuffer.h | 6 +
gtk/gtktextlayout.c | 18 +++
gtk/gtktexttag.c | 72 ++++++++++++
gtk/gtktexttagprivate.h | 2 +
gtk/gtkwidget.c | 4 +-
gtk/theme/Adwaita/_common.scss | 26 ++--
gtk/theme/Adwaita/gtk-contained-dark.css | 23 ++--
gtk/theme/Adwaita/gtk-contained.css | 23 ++--
gtk/theme/HighContrast/_common.scss | 40 +++++---
gtk/theme/HighContrast/gtk.css | 36 ++++---
po-properties/POTFILES.skip | 80 +++++++-------
35 files changed, 830 insertions(+), 159 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]