[gtk+/quartz-integration: 23/23] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 23/23] Merge branch 'master' into quartz-integration
- Date: Sat, 27 Aug 2011 06:29:36 +0000 (UTC)
commit 588a471fde4452f8ac745c5a7a877a32499026ca
Merge: 442d7df c8e8cda
Author: John Ralls <jralls ceridwen us>
Date: Fri Aug 26 23:21:20 2011 -0700
Merge branch 'master' into quartz-integration
docs/reference/gtk/gtk3-sections.txt | 14 +
gtk/Makefile.am | 3 +
gtk/gtk.h | 1 +
gtk/gtk.symbols | 10 +
gtk/gtkcolorbutton.c | 2 -
gtk/gtkcssparser.c | 13 +-
gtk/gtkcssprovider.c | 457 +++--
gtk/gtkcssprovider.h | 5 +-
gtk/gtkcsssection.c | 308 +++
gtk/gtkcsssection.h | 84 +
gtk/gtkcsssectionprivate.h | 40 +
gtk/gtkfilechooserdefault.c | 45 +-
gtk/gtklabel.c | 3 +-
gtk/gtkmarshalers.list | 1 -
gtk/gtknotebook.c | 2 +-
gtk/gtkpango.c | 1 +
gtk/gtkstatusicon.c | 13 +-
gtk/gtkstyleproperty.c | 2 +-
po-properties/POTFILES.skip | 2 +
po-properties/zh_HK.po | 2933 ++++++++++++------------
po-properties/zh_TW.po | 2933 ++++++++++++------------
po/POTFILES.skip | 2 +
tests/css/Makefile.am | 21 +
tests/css/api.c | 49 +
tests/css/parser/test-css-parser.c | 15 +-
tests/reftests/Makefile.am | 2 +
tests/reftests/notebook-childproperties.ref.ui | 68 +
tests/reftests/notebook-childproperties.ui | 78 +
tests/testboxcss.c | 17 +-
29 files changed, 4077 insertions(+), 3047 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
