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



commit 78a750667ad848706ae1501723c92514a4712492
Merge: 9e5ec9e 3067ef4
Author: John Ralls <jralls ceridwen us>
Date:   Tue Feb 1 23:21:11 2011 -0800

    Merge branch 'master' into quartz-integration

 configure.ac                |    2 +-
 gtk/Makefile.am             |    2 +
 gtk/gtkcelllayout.c         |   52 ++++++++++++++++++++----------------------
 gtk/gtkcontainer.c          |   38 +++++++++++++++----------------
 gtk/gtkfixed.c              |    4 ++-
 modules/engines/Makefile.am |    4 +-
 6 files changed, 51 insertions(+), 51 deletions(-)
---



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