Merge 'master' into 'psppsheet'. 20121202031952/pspp 20121203032039/pspp 20121204032004/pspp 20121205032030/pspp 20121206032021/pspp 20121207032036/pspp 20121208032040/pspp 20121209032019/pspp 20121210032023/pspp 20121211032038/pspp 20121212032028/pspp 20121213032029/pspp 20121214032036/pspp 20121215032028/pspp 20121216032020/pspp 20121217032038/pspp 20121218031957/pspp 20121219032034/pspp 20121220032031/pspp 20121221032037/pspp 20121222032032/pspp 20121223032002/pspp 20121225032008/pspp 20121226032016/pspp 20121227032003/pspp 20121228032058/pspp 20121229032201/pspp 20121230032128/pspp
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 2 Dec 2012 03:39:07 +0000 (19:39 -0800)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 2 Dec 2012 03:39:07 +0000 (19:39 -0800)
commitfa1fffd5c789d9c7875fc3bdf556eaf017cf524e
treecc5b39557bf6cfc684e8fa40bf0e3d6fadaef931
parentea17c5b225557fc0760810861451a84dc241d462
parentf548196d5cc509d19ba0f7c67da513e9dd4f996d
Merge 'master' into 'psppsheet'.
src/ui/gui/aggregate-dialog.c
src/ui/gui/automake.mk
src/ui/gui/chi-square-dialog.c
src/ui/gui/data-editor.ui
src/ui/gui/psppire-data-window.c
src/ui/gui/runs-dialog.c