Merge branch 'master' into output fc11-i386-build61 fc11-x64-build58 lenny-x64-build82 sid-i386-build128
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 18 Dec 2009 19:34:12 +0000 (20:34 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 18 Dec 2009 19:34:12 +0000 (20:34 +0100)
commit7c08a6e1009cf60847e770a77a73c650e9326379
treeef40e145238e387bb05fb5884ea2b03951e3179e
parentd7551158e8b3eb352fbbaa97628f3fa82e4186d6
parentfc1c214753f9074c05ac1609d8cdecbdf1eea255
Merge branch 'master' into output

Conflicts:

NEWS
configure.ac
src/output/charts/dummy-chart.c
NEWS
configure.ac
perl-module/lib/PSPP.pm
src/language/stats/correlations.c
src/language/stats/roc.c
src/language/stats/t-test.q
src/ui/gui/automake.mk
src/ui/gui/find-dialog.c
src/ui/gui/psppire.c