[gtk+/quartz-integration: 517/851] Merge branch 'master' into quartz-integration
- From: John Ralls <jralls src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/quartz-integration: 517/851] Merge branch 'master' into quartz-integration
- Date: Fri, 24 Dec 2010 21:26:41 +0000 (UTC)
commit 4d2cc86d53a9c926a66d3140db2062f41baac72f
Merge: 5d709b9 d4e9cd0
Author: John Ralls <jralls ceridwen us>
Date: Sun Dec 19 23:21:07 2010 -0800
Merge branch 'master' into quartz-integration
gtk/gtk.symbols | 19 +
gtk/gtkcellareabox.c | 2 +-
gtk/gtkdnd.c | 1 +
gtk/gtkselection.c | 5 +-
gtk/gtkselection.h | 22 --
gtk/gtkselectionprivate.h | 40 +++
po/fa.po | 851 ++++++++++++++++++++++-----------------------
po/vi.po | 254 ++++++++------
8 files changed, 637 insertions(+), 557 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]