Merge commit 'HEAD'; commit 'master/master'
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 4 Jan 2009 08:30:30 +0000 (17:30 +0900)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 4 Jan 2009 08:30:30 +0000 (17:30 +0900)
commitb6bcae693f035491ae0625f301f3e630c1335555
treeecd81c6ad80719b3862990f61145926134a9e7f9
parent31bd57d71cdbdc32082c32c255822122b7d69fab
parent31bd57d71cdbdc32082c32c255822122b7d69fab
parent9bf1c33953f7feff2a24a06293f6fe96b75cc41a
Merge commit 'HEAD'; commit 'master/master'

Conflicts:

src/ui/gui/crosstabs-dialog.c
src/ui/gui/goto-case-dialog.c
src/ui/gui/helper.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-syntax-window.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/syntax-editor.glade
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