Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 26 Nov 2008 04:28:36 +0000 (13:28 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 26 Nov 2008 04:28:36 +0000 (13:28 +0900)
Conflicts:

lib/gtksheet/automake.mk

lib/gtksheet/automake.mk

index fc7708aa9ad94179cc20be9ebae52caf2fa51043..2dd381b9d5ffa2db2c896a09cdf2301929c6e409 100644 (file)
@@ -8,6 +8,10 @@ lib_gtksheet_libgtksheet_a_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
 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 \