From: John Darrington Date: Wed, 26 Nov 2008 04:28:36 +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~112 X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e59613aae24bbddcaba25415a67dcf2010ebb55c;hp=-c;p=pspp-builds.git Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite-sheet Conflicts: lib/gtksheet/automake.mk --- e59613aae24bbddcaba25415a67dcf2010ebb55c diff --combined lib/gtksheet/automake.mk index fc7708aa,66bee434..2dd381b9 --- a/lib/gtksheet/automake.mk +++ b/lib/gtksheet/automake.mk @@@ -8,6 -8,10 +8,10 @@@ lib_gtksheet_libgtksheet_a_CFLAGS = $(G lib_gtksheet_libgtksheet_a_SOURCES = \ lib/gtksheet/gsheetmodel.c \ lib/gtksheet/gsheetmodel.h \ + lib/gtksheet/gsheet-row-iface.c \ + lib/gtksheet/gsheet-row-iface.h \ + lib/gtksheet/gsheet-uniform-row.c \ + lib/gtksheet/gsheet-uniform-row.h \ lib/gtksheet/gtkextra-marshal.c \ lib/gtksheet/gtkextra-marshal.h \ lib/gtksheet/gtkextra-sheet.h \ @@@ -18,12 -22,7 +22,12 @@@ lib/gtksheet/gtkxpaned.c \ lib/gtksheet/gtkxpaned.h \ lib/gtksheet/psppire-axis.c \ - lib/gtksheet/psppire-axis.h + lib/gtksheet/psppire-axis.h \ + lib/gtksheet/psppire-axis-hetero.c \ + lib/gtksheet/psppire-axis-hetero.h \ + lib/gtksheet/psppire-axis-uniform.c \ + lib/gtksheet/psppire-axis-uniform.h + EXTRA_DIST += lib/gtksheet/OChangeLog \