[gtk+/quartz-integration: 14/14] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 14/14] Merge branch 'master' into quartz-integration
- Date: Wed, 20 Jul 2011 06:28:51 +0000 (UTC)
commit ea6c225235ac079fd287679e181993c757459b57
Merge: 71d5e14 dc01496
Author: John Ralls <jralls ceridwen us>
Date: Tue Jul 19 23:21:04 2011 -0700
Merge branch 'master' into quartz-integration
build/win32/vs10/README.txt | 28 +-
build/win32/vs10/gailutil.vcxproj | 8 +-
build/win32/vs10/gtk+.props | 2 +-
build/win32/vs10/gtk.vcxprojin | 8 +-
build/win32/vs9/README.txt | 27 +-
build/win32/vs9/gailutil.vcproj | 8 +-
build/win32/vs9/gtk+.vsprops | 2 +-
build/win32/vs9/gtk.vcprojin | 8 +-
gtk/gtkcssparser.c | 2 +-
gtk/gtkcssprovider.c | 30 ++-
gtk/gtknotebook.c | 34 +--
gtk/gtkstyleproperties.c | 7 +
gtk/gtkstyleproperty.c | 126 ++++++-
gtk/gtkstylepropertyprivate.h | 6 +-
gtk/tests/stylecontext.c | 113 ------
po/sl.po | 393 +++++++++++----------
tests/css/parser/Makefile.am | 125 +++++++
tests/css/parser/at-invalid-01.css | 1 +
tests/css/parser/at-invalid-01.errors | 1 +
tests/css/parser/at-invalid-02.css | 1 +
tests/css/parser/at-invalid-02.errors | 1 +
tests/css/parser/at-invalid-03.css | 1 +
tests/css/parser/at-invalid-03.errors | 1 +
tests/css/parser/at-invalid-04.css | 1 +
tests/css/parser/at-invalid-04.errors | 1 +
tests/css/parser/at-invalid-05.css | 1 +
tests/css/parser/at-invalid-05.errors | 1 +
tests/css/parser/at-invalid-06.css | 1 +
tests/css/parser/at-invalid-06.errors | 1 +
tests/css/parser/at-invalid-07.css | 1 +
tests/css/parser/at-invalid-07.errors | 1 +
tests/css/parser/at-invalid-08.css | 1 +
tests/css/parser/at-invalid-08.errors | 1 +
tests/css/parser/at-invalid-09.css | 1 +
tests/css/parser/at-invalid-09.errors | 1 +
tests/css/parser/at-invalid-10.css | 1 +
tests/css/parser/at-invalid-10.errors | 1 +
tests/css/parser/at-invalid-11.css | 1 +
tests/css/parser/at-invalid-11.errors | 1 +
tests/css/parser/at-invalid-12.css | 1 +
tests/css/parser/at-invalid-12.errors | 1 +
tests/css/parser/at-invalid-13.css | 1 +
tests/css/parser/at-invalid-13.errors | 1 +
tests/css/parser/at-invalid-14.css | 1 +
tests/css/parser/at-invalid-14.errors | 1 +
tests/css/parser/at-invalid-15.css | 1 +
tests/css/parser/at-invalid-15.errors | 1 +
tests/css/parser/at-invalid-16.css | 1 +
tests/css/parser/at-invalid-16.errors | 1 +
tests/css/parser/at-invalid-17.css | 1 +
tests/css/parser/at-invalid-17.errors | 1 +
tests/css/parser/at-invalid-18.css | 1 +
tests/css/parser/at-invalid-18.errors | 1 +
tests/css/parser/at-invalid-19.css | 1 +
tests/css/parser/at-invalid-19.errors | 1 +
tests/css/parser/at-invalid-20.css | 1 +
tests/css/parser/at-invalid-20.errors | 1 +
tests/css/parser/at-invalid-21.css | 1 +
tests/css/parser/at-invalid-21.errors | 2 +
tests/css/parser/at-invalid-22.css | 1 +
tests/css/parser/at-invalid-22.errors | 1 +
tests/css/parser/at-invalid-23.css | 1 +
tests/css/parser/at-invalid-23.errors | 2 +
tests/css/parser/at-invalid-24.css | 1 +
tests/css/parser/at-invalid-24.errors | 2 +
tests/css/parser/at-invalid-25.css | 1 +
tests/css/parser/at-invalid-25.errors | 2 +
tests/css/parser/at-invalid-26.css | 1 +
tests/css/parser/at-invalid-26.errors | 2 +
tests/css/parser/at-invalid-27.css | 1 +
tests/css/parser/at-invalid-27.errors | 2 +
tests/css/parser/at-valid-01.css | 1 +
tests/css/parser/at-valid-01.ref.css | 3 +
tests/css/parser/at-valid-02.css | 1 +
tests/css/parser/at-valid-02.ref.css | 3 +
tests/css/parser/at-valid-03.css | 1 +
tests/css/parser/at-valid-03.ref.css | 3 +
tests/css/parser/at-valid-04.css | 1 +
tests/css/parser/at-valid-04.ref.css | 3 +
tests/css/parser/at-valid-05.css | 2 +
tests/css/parser/at-valid-05.ref.css | 3 +
tests/css/parser/at-valid-06.css | 1 +
tests/css/parser/at-valid-06.ref.css | 1 +
tests/css/parser/at-valid-07.css | 1 +
tests/css/parser/at-valid-08.css | 1 +
tests/css/parser/at-valid-08.ref.css | 1 +
tests/css/parser/at-valid-09.css | 1 +
tests/css/parser/at-valid-09.ref.css | 1 +
tests/css/parser/at-valid-10.css | 1 +
tests/css/parser/at-valid-10.ref.css | 1 +
tests/css/parser/at-valid-11.css | 1 +
tests/css/parser/at-valid-11.ref.css | 1 +
tests/css/parser/at-valid-12.css | 1 +
tests/css/parser/at-valid-12.ref.css | 1 +
tests/css/parser/at-valid-13.css | 1 +
tests/css/parser/at-valid-13.ref.css | 1 +
tests/css/parser/at-valid-14.css | 1 +
tests/css/parser/at-valid-14.ref.css | 1 +
tests/css/parser/at-valid-15.css | 1 +
tests/css/parser/at-valid-15.ref.css | 1 +
tests/css/parser/at-valid-16.css | 1 +
tests/css/parser/at-valid-16.ref.css | 1 +
tests/css/parser/at-valid-17.css | 1 +
tests/css/parser/at-valid-18.css | 1 +
tests/css/parser/at-valid-18.ref.css | 1 +
tests/css/parser/at-valid-19.css | 1 +
tests/css/parser/at-valid-19.errors | 1 +
tests/css/parser/at-valid-20.css | 4 +
tests/css/parser/at-valid-20.errors | 1 +
tests/css/parser/at-valid-21.css | 4 +
tests/css/parser/at-valid-21.errors | 1 +
tests/reftests/Makefile.am | 2 +
tests/reftests/messagedialog-secondarytext.ref.ui | 14 +
tests/reftests/messagedialog-secondarytext.ui | 19 +
114 files changed, 675 insertions(+), 404 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
