Merge commit 'HEAD'; commit 'savannah/master'
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 20 Feb 2009 01:22:49 +0000 (10:22 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 20 Feb 2009 01:22:49 +0000 (10:22 +0900)
commit8953baa61127d6d3b91f763663ea647bf3e4e793
tree897fb2ada2917a93623ad85fd07e740639b4ba29
parent9dee07e30883ae4e1c72ebf3c612655fdf8ad6f5
parentdff7c7a05e6da0de78544fa97c6882bd4a40d977
Merge commit 'HEAD'; commit 'savannah/master'

Conflicts:

src/ui/gui/crosstabs-dialog.c
src/ui/gui/goto-case-dialog.c
src/ui/gui/helper.c
src/ui/gui/output-viewer.c
src/ui/gui/output-viewer.h
src/ui/gui/psppire.c
src/ui/gui/regression-dialog.c
25 files changed:
src/ui/gui/automake.mk
src/ui/gui/comments-dialog.c
src/ui/gui/compute-dialog.c
src/ui/gui/crosstabs-dialog.c
src/ui/gui/examine-dialog.c
src/ui/gui/find-dialog.c
src/ui/gui/frequencies-dialog.c
src/ui/gui/goto-case-dialog.c
src/ui/gui/helper.c
src/ui/gui/helper.h
src/ui/gui/oneway-anova-dialog.c
src/ui/gui/psppire-data-store.c
src/ui/gui/psppire.c
src/ui/gui/rank-dialog.c
src/ui/gui/recode-dialog.c
src/ui/gui/regression-dialog.c
src/ui/gui/select-cases-dialog.c
src/ui/gui/sort-cases-dialog.c
src/ui/gui/split-file-dialog.c
src/ui/gui/t-test-independent-samples-dialog.c
src/ui/gui/t-test-one-sample.c
src/ui/gui/t-test-paired-samples.c
src/ui/gui/transpose-dialog.c
src/ui/gui/variable-info-dialog.c
src/ui/gui/weight-cases-dialog.c