Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 24 Nov 2008 13:16:02 +0000 (22:16 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 24 Nov 2008 13:16:02 +0000 (22:16 +0900)
commitddd7c113f3e50c8d87f6a677856799d05a1f40c7
treea11c8ff7adf539b7d5ed1cc2496688a46b0f8954
parent11706f97dd318697e43e6468b130ca5b7f1bff87
parentbfa3bb62acfb1496a028c4baa800b2d2c5b543f5
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite-sheet

Conflicts:

lib/gtksheet/gtksheet.c
lib/gtksheet/gtksheet.c
lib/gtksheet/psppire-axis.c
lib/gtksheet/psppire-axis.h
src/data/dictionary.c
src/data/dictionary.h
src/data/vardict.h
src/data/variable.c
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-dict.c
src/ui/gui/psppire-dict.h
src/ui/gui/psppire-var-sheet.c