Merge "master" into "psppsheet" to obtain bug fixes from "master". 20120709001830/pspp 20120710001843/pspp
authorBen Pfaff <blp@cs.stanford.edu>
Mon, 9 Jul 2012 05:18:20 +0000 (22:18 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Mon, 9 Jul 2012 05:18:20 +0000 (22:18 -0700)
commitbea8b007855970c07083dbec5b5cc90f33990957
treee23f43cc84cb5241caa832ec5746437c185f2f03
parent368a055fded96761bc761a7d05b775ce7902be63
parent50652d204ce6aae87f6a165a499cf5d460f1f557
Merge "master" into "psppsheet" to obtain bug fixes from "master".
src/ui/gui/psppire-data-window.c
src/ui/gui/text-data-import-dialog.c