Merge 'master' into 'psppsheet'.
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 30 Sep 2012 18:25:23 +0000 (11:25 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 30 Sep 2012 18:25:55 +0000 (11:25 -0700)
commite943de7a3e0645852c3b659889ff3ccf38dd43ec
treebed2621786453193592cbbf0661996bd6137c7fe
parent04c546cc97483bb87e79184c3e78060fdf296e7d
parent8d1e072157ee3c8273e328c491be3c8bf57452da
Merge 'master' into 'psppsheet'.
src/ui/gui/autorecode-dialog.c
src/ui/gui/pspp-sheet-view.c
src/ui/gui/recode-dialog.c
src/ui/gui/split-file-dialog.c