Merge master into gtk3. 20131026032545/pspp 20131027032559/pspp 20131028032549/pspp 20131030030824/pspp 20131031032414/pspp 20131101032516/pspp 20131102032602/pspp 20131103032703/pspp 20131104032617/pspp 20131105032650/pspp 20131106032624/pspp 20131107032703/pspp 20131108032720/pspp 20131110032717/pspp 20131111032724/pspp 20131112032726/pspp 20131113032746/pspp 20131114032755/pspp 20131115032755/pspp 20131116032752/pspp
authorBen Pfaff <blp@cs.stanford.edu>
Sat, 26 Oct 2013 05:05:05 +0000 (22:05 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Sat, 26 Oct 2013 05:36:15 +0000 (22:36 -0700)
commite2da62d735c597afeef2e0e9b36e5a4a83d7da94
treec3e8d9f12ac6542cd3757c4348726c36aed053dc
parent074b8460c21980a02dcc545030a4c6bd9d3f9617
parent69a0cb6bf086d71388a328194da41fb4c4d5b571
Merge master into gtk3.
17 files changed:
INSTALL
configure.ac
src/output/cairo.c
src/output/cairo.h
src/output/render.c
src/ui/gui/automake.mk
src/ui/gui/main.c
src/ui/gui/page-assistant.c
src/ui/gui/page-separators.c
src/ui/gui/pspp-sheet-view.c
src/ui/gui/psppire-conf.c
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-data-sheet.c
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-output-window.c
src/ui/gui/syntax-editor.ui
src/ui/gui/text-data-import-dialog.c