Merge commit 'origin/stable' build40
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 24 Sep 2009 18:43:42 +0000 (20:43 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 24 Sep 2009 18:43:42 +0000 (20:43 +0200)
commitbd17d2af982332ee1791998361b1ac6731fe14fa
tree41e6cb14a866e72d64c4612fb1d15e142b56430e
parent6c547fbd903690cc0e770ed9ffe78189b42de58a
parentf5d9f9911bd04682a7edfb48521a12202e561e0a
Merge commit 'origin/stable'

Conflicts:

AUTHORS
NEWS
configure.ac
lib/gtksheet/gtkitementry.c
po/LINGUAS
po/nl.po
src/data/file-name.c
src/data/sys-file-writer.c
src/language/stats/crosstabs.q
src/language/stats/examine.q
src/language/stats/t-test.q
src/output/charts/box-whisker.c
src/output/charts/plot-hist.c
src/ui/gui/output-viewer.c
src/ui/gui/psppire.c
src/ui/gui/psppire.h
src/ui/terminal/main.c
14 files changed:
AUTHORS
NEWS
po/automake.mk
src/data/file-name.c
src/data/sys-file-writer.c
src/language/stats/examine.q
src/language/stats/regression.q
src/language/stats/t-test.q
src/output/charts/box-whisker.c
src/output/charts/plot-chart.h
src/output/charts/plot-hist.c
src/ui/gui/psppire.c
src/ui/gui/psppire.h
src/ui/terminal/main.c