Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite...
authorJohn Darrington <john@darrington.wattle.id.au>
Mon, 1 Dec 2008 09:35:16 +0000 (18:35 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Mon, 1 Dec 2008 09:35:16 +0000 (18:35 +0900)
commit912ff5beae407cded83c9e389a2fd3c9166fd2c0
tree01ab856bd58e377cd6ed9540df56057d9ff982e2
parent7705ee1088e83c4d3d1bbb05039f2abb9af803b6
parentf7dd956cea4cd70d922deae4b70fd08e59346a12
Merge branch 'rewrite-sheet' of ssh://jmd@git.sv.gnu.org/srv/git/pspp into rewrite-sheet

Conflicts:

src/ui/gui/psppire-var-store.h
src/ui/gui/psppire-var-store.c
src/ui/gui/psppire-var-store.h