Merge 'master' into 'psppsheet'. 20121231032129/pspp 20130101032123/pspp 20130102032118/pspp 20130103032118/pspp 20130104032103/pspp 20130105032146/pspp 20130106032112/pspp
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 30 Dec 2012 03:21:39 +0000 (19:21 -0800)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 30 Dec 2012 03:21:39 +0000 (19:21 -0800)
commit6f3865480503c571963d8a2d1af858a4d72d4e88
tree8db5ba2f29e3ac5de6e99dde8b0c88d0fb21fab9
parentfa1fffd5c789d9c7875fc3bdf556eaf017cf524e
parentd49a471a1fa405dd68d51ade4a4fed35b77cc41d
Merge 'master' into 'psppsheet'.
src/libpspp/str.c
src/libpspp/str.h
src/ui/gui/aggregate-dialog.c
src/ui/gui/chi-square-dialog.c
src/ui/gui/count-dialog.c
src/ui/gui/oneway-anova-dialog.c
src/ui/gui/recode-dialog.c