From: John Darrington Date: Wed, 19 Nov 2008 08:21:33 +0000 (+0900) Subject: Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite... X-Git-Tag: v0.7.1~144 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e1469fde0a9b5bd3fefe52d7d8379b7379a618b;p=pspp-builds.git Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite-sheet Conflicts: lib/gtksheet/gtksheet.c --- 5e1469fde0a9b5bd3fefe52d7d8379b7379a618b diff --cc lib/gtksheet/gtksheet.c index 3152f894,8e5e49c9..9f26115c --- a/lib/gtksheet/gtksheet.c +++ b/lib/gtksheet/gtksheet.c @@@ -546,12 -548,7 +546,6 @@@ static void gtk_sheet_button_size_reque const GtkSheetButton *button, GtkRequisition *requisition); - /* Attributes routines */ - static void init_attributes (const GtkSheet *sheet, - gint col, - GtkSheetCellAttr *attributes); - - -/* Memory allocation routines */ static void gtk_sheet_real_cell_clear (GtkSheet *sheet, gint row, gint column);