[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, 6 Feb 2011 07:28:55 +0000 (UTC)
commit 2654ddae80ccb1854f4465905ea77d70f4acab8e
Merge: c76194b 69e4a3f
Author: John Ralls <jralls ceridwen us>
Date: Sat Feb 5 23:21:12 2011 -0800
Merge branch 'master' into quartz-integration
gtk/gtkcssprovider.c | 2 -
gtk/gtkthemingengine.c | 70 ++-
gtk/gtkwidget.c | 2 +-
po-properties/gl.po | 1435 ++++++++++++++++++++++++------------------------
po/gl.po | 745 +++++++++++++++----------
tests/testtreepos.c | 19 +-
6 files changed, 1227 insertions(+), 1046 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]