[gtk+/quartz-integration: 11/11] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 11/11] Merge branch 'master' into quartz-integration
- Date: Sat, 26 Mar 2011 06:30:19 +0000 (UTC)
commit e58026dc4a01fbd9b86d2dd075c81daec58aa0dc
Merge: 5cca185 e05cde5
Author: John Ralls <jralls ceridwen us>
Date: Fri Mar 25 23:21:10 2011 -0700
Merge branch 'master' into quartz-integration
build/win32/vs9/gtk+.vsprops | 2 +-
gtk/gtkbin.c | 14 -
gtk/gtkbox.c | 12 -
gtk/gtkcellview.c | 11 +
gtk/gtkcontainer.c | 54 +++
gtk/gtkenums.h | 4 +-
gtk/gtkgrid.c | 21 +-
gtk/gtklabel.c | 8 +-
gtk/gtksizerequest.c | 421 ++++++++++++------
gtk/gtkwidget.c | 63 ++--
gtk/gtkwidget.h | 15 +-
gtk/gtkwidgetprivate.h | 42 +-
gtk/gtkwindow.c | 19 +-
po-properties/bg.po | 1037 ++++++++++++++++++++++--------------------
po/ko.po | 10 +-
po/sv.po | 976 +++++++++++++++++++++++++++++++---------
16 files changed, 1749 insertions(+), 960 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]