Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...

Conflicts:

	lib/gtksheet/automake.mk

diff --combined lib/gtksheet/automake.mk
index fc7708aa9ad94179cc20be9ebae52caf2fa51043,66bee434744a0c6d3c2065172b6859369010c946..2dd381b9d5ffa2db2c896a09cdf2301929c6e409
--- 1/lib/gtksheet/automake.mk
--- 2/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 \