[gtk+/quartz-integration: 34/35] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 34/35] Merge branch 'master' into quartz-integration
- Date: Thu, 1 Sep 2011 06:32:05 +0000 (UTC)
commit ad9ad59b7f5f0fb0e1ef6ef9617267d15eb9a6f3
Merge: c6b9dfe 8cd9e34
Author: John Ralls <jralls ceridwen us>
Date: Wed Aug 31 11:55:33 2011 -0700
Merge branch 'master' into quartz-integration
Conflicts:
NEWS
configure.ac
NEWS | 10 ++++++++
README.win32 | 12 +++++++--
build/win32/vs10/README.txt | 9 ++++++-
build/win32/vs9/README.txt | 9 ++++++-
configure.ac | 4 +-
gtk+.doap | 1 +
gtk/Makefile.am | 10 ++++++-
gtk/gtktoolshell.c | 52 +++++++++++++++++++++++++++++-------------
gtk/gtkwidget.c | 21 ++++++++++------
tests/a11y/Makefile.am | 5 +++-
10 files changed, 99 insertions(+), 34 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]