[gtk+/quartz-integration: 7/7] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 7/7] Merge branch 'master' into quartz-integration
- Date: Sun, 8 May 2011 06:30:54 +0000 (UTC)
commit d088700267eb8c2f68d9d0a70c50ac99dd5e167e
Merge: d970483 2e1fa6d
Author: John Ralls <jralls ceridwen us>
Date: Sat May 7 23:21:06 2011 -0700
Merge branch 'master' into quartz-integration
Makefile.decl | 2 +-
configure.ac | 2 +-
docs/reference/gtk/Makefile.am | 2 +-
gdk/x11/gdkcursor-x11.c | 2 +-
po/es.po | 585 ++++++++++++++++++++++------------------
5 files changed, 327 insertions(+), 266 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]