[gtk+/quartz-integration: 31/31] Merge branch 'master' into quartz-integration



commit aea00ba7343acf9099482218b0710c991ca4f765
Merge: 4999a7a da1f618
Author: John Ralls <jralls ceridwen us>
Date:   Tue Apr 19 23:21:25 2011 -0700

    Merge branch 'master' into quartz-integration

 docs/reference/gtk/tmpl/.gitignore |    1 +
 docs/reference/gtk/tmpl/gtkrc.sgml | 1057 -------
 gdk/broadway/broadway.js           |    2 +-
 gdk/broadway/client.html           |   52 +-
 gtk/gtkentry.c                     |  112 +-
 gtk/gtklabel.c                     |  346 +--
 gtk/gtkpaned.c                     |  133 +-
 gtk/gtkrc.c                        |  778 +++++-
 gtk/gtkrc.h                        |   69 +
 gtk/gtkwidget.c                    |   33 +-
 gtk/gtkwidget.h                    |    2 -
 po-properties/lt.po                | 5617 ++++++++++++++++++++----------------
 12 files changed, 4258 insertions(+), 3944 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]