[gtk+/quartz-integration: 10/10] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 10/10] Merge branch 'master' into quartz-integration
- Date: Sat, 2 Jul 2011 06:30:16 +0000 (UTC)
commit b3a1533d2e565dfb2745aa41a108572aca4a386d
Merge: 4028404 ba76f54
Author: John Ralls <jralls ceridwen us>
Date: Fri Jul 1 23:21:10 2011 -0700
Merge branch 'master' into quartz-integration
gtk/gtkbox.c | 75 +++++-----
gtk/gtktoolbar.c | 160 +++++++++++++++++++++-
tests/reftests/Makefile.am | 3 +
tests/reftests/style-properties-nth-child.css | 11 ++
tests/reftests/style-properties-nth-child.ref.ui | 71 ++++++++++
tests/reftests/style-properties-nth-child.ui | 70 ++++++++++
tests/testboxcss.c | 58 +++++++--
7 files changed, 397 insertions(+), 51 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]