Merge 'psppsheet' into 'master'. 20130507010505/pspp
authorBen Pfaff <blp@cs.stanford.edu>
Tue, 7 May 2013 05:09:59 +0000 (22:09 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Tue, 7 May 2013 05:09:59 +0000 (22:09 -0700)
commit0b0ca44889e637251cb5f2dbf3c7fdc4ec8b9bd7
treee25bf1ec7ff62d6b3a903fce63c224562a0cad85
parent30e8709a43952db775843e3e72c9f51462ffc82e
parenta3a1e6b575eb7cbe4e7d89ea67d35b18c8ef5055
Merge 'psppsheet' into 'master'.

This merge required considerable manual resolution in
text-data-import-dialog.c because that file was split into multiple files
on master.
src/ui/gui/automake.mk
src/ui/gui/data-editor.ui
src/ui/gui/page-assistant.c
src/ui/gui/page-file.c
src/ui/gui/page-first-line.c
src/ui/gui/page-formats.c
src/ui/gui/page-intro.c
src/ui/gui/page-separators.c
src/ui/gui/psppire-data-window.c
src/ui/gui/text-data-import-dialog.c
src/ui/gui/text-data-import-dialog.h