[gtk+/master.fcw: 245/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: 245/648] Merge branch 'master' into master.fcw
- Date: Wed, 4 Feb 2015 05:05:59 +0000 (UTC)
commit 764c45110e338db12a56506ba9f139e6c6d2e2c9
Merge: 6fd726b 4288d7d
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Dec 15 11:03:11 2014 +0800
Merge branch 'master' into master.fcw
README.in | 5 +
configure.ac | 2 +-
demos/gtk-demo/editable_cells.c | 25 +-
demos/widget-factory/widget-factory.ui | 32 +-
docs/reference/gtk/gtk3-sections.txt | 6 +-
examples/README | 2 +-
examples/application1/Makefile.example | 2 +-
examples/application10/Makefile.example | 34 +
examples/application2/Makefile.example | 1 +
examples/application3/Makefile.example | 1 +
examples/application4/Makefile.example | 1 +
examples/application5/Makefile.example | 3 +-
examples/application6/Makefile.example | 3 +-
examples/application7/Makefile.example | 3 +-
examples/application8/Makefile.example | 3 +-
examples/application9/Makefile.example | 3 +-
gdk/Makefile.am | 2 +-
gdk/broadway/gdkeventsource.h | 6 +-
gdk/gdkenumtypes.h.template | 6 +-
gdk/gdkframeclock.h | 6 +-
gdk/gdkframetimings.h | 6 +-
gdk/x11/gdkeventsource.h | 6 +-
git.mk | 17 +-
gtk/deprecated/gtkstyleproperties.c | 12 +-
gtk/gtkactionhelper.c | 2 +-
gtk/gtkactionmuxer.c | 4 +-
gtk/gtkactionmuxer.h | 2 +-
gtk/gtkappchooserwidget.c | 15 +-
gtk/gtkapplication-quartz-menu.c | 2 +-
gtk/gtkbox.c | 4 +-
gtk/gtkcontainer.c | 2 +-
gtk/gtkcssprovider.c | 28 +-
gtk/gtkcssselector.c | 1612 +++----
gtk/gtkcssselectorprivate.h | 4 +-
gtk/gtkentry.c | 35 +-
gtk/gtkentry.h | 3 +
gtk/gtkentrycompletion.c | 6 +
gtk/gtkfilesystemmodel.c | 5 +-
gtk/gtkiconcachevalidator.c | 178 +-
gtk/gtkicontheme.c | 11 +-
gtk/gtkmenu.h | 4 +-
gtk/gtkmenusectionbox.c | 2 +-
gtk/gtkmenushell.c | 2 +-
gtk/gtkmenutracker.c | 2 +-
gtk/gtkmenutrackeritem.c | 8 +-
gtk/gtkmodifierstyle.c | 17 +-
gtk/gtkplacessidebar.c | 6 +-
gtk/gtkplacessidebar.h | 7 +-
gtk/gtkpopover.c | 24 +-
gtk/gtkscale.c | 16 +-
gtk/gtkscrollable.c | 28 +
gtk/gtkscrollable.h | 8 +
gtk/gtkscrolledwindow.c | 91 +-
gtk/gtksettings.c | 9 -
gtk/gtkstack.c | 41 +-
gtk/gtkstackswitcher.c | 1 +
gtk/gtkstylecascade.c | 37 +-
gtk/gtkstylecontext.c | 56 +-
gtk/gtkstylecontext.h | 10 +
gtk/gtkstyleproviderprivate.c | 25 +-
gtk/gtkstyleproviderprivate.h | 10 +-
gtk/gtktextattributes.h | 22 +-
gtk/gtktextiter.c | 50 +-
gtk/gtktexttag.c | 8 +
gtk/gtktextview.c | 9 +-
gtk/gtktreemodel.c | 12 +-
gtk/gtktreeview.c | 21 +-
gtk/gtktypebuiltins.h.template | 6 +-
gtk/gtkwidget.c | 106 +-
gtk/gtkwidget.h | 7 +
gtk/gtkwidgetprivate.h | 6 +-
gtk/gtkwindow.c | 13 +-
gtk/inspector/actions.c | 6 +-
gtk/inspector/css-editor.ui | 1 +
gtk/inspector/init.c | 24 +-
gtk/inspector/inspect-button.c | 4 +-
gtk/inspector/prop-editor.c | 2 +-
gtk/inspector/statistics.ui | 10 +-
gtk/inspector/visual.c | 106 +-
gtk/inspector/visual.ui | 81 +-
gtk/inspector/visual.ui.h | 4 +-
gtk/inspector/window.c | 59 +
gtk/inspector/window.h | 3 +
gtk/inspector/window.ui | 214 +-
gtk/theme/Adwaita/_common.scss | 34 +
gtk/theme/Adwaita/gtk-contained-dark.css | 67 +-
gtk/theme/Adwaita/gtk-contained.css | 67 +-
gtk/theme/Raleigh/gtk-default.css | 2 +-
gtk/ui/gtkfilechooserwidget.ui | 2 +-
gtk/updateiconcache.c | 216 +-
po-properties/he.po | 1301 +++---
po-properties/tr.po | 8595 +++++++++++++++++++-----------
po/he.po | 888 ++--
po/tr.po | 7398 ++++++++++++++++++--------
po/vi.po | 6004 +++++++++++----------
tests/variable.h | 2 +-
96 files changed, 16738 insertions(+), 11116 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]