Merge 'master' into 'psppsheet'.
authorBen Pfaff <blp@cs.stanford.edu>
Sun, 19 Aug 2012 20:16:05 +0000 (13:16 -0700)
committerBen Pfaff <blp@cs.stanford.edu>
Sun, 19 Aug 2012 20:16:05 +0000 (13:16 -0700)
commitf481fd69631024bcdc7dc2369bbc1592d7a43ac7
treebc04a3f615af6c8c1f6b797b42e0fa2f3550b474
parentec9ef1ece2392967ddf17980089bc4692931d6c3
parentace5fed0c507901119c906dc72f1c058bbb6f587
Merge 'master' into 'psppsheet'.
src/ui/gui/aggregate-dialog.c
src/ui/gui/automake.mk
src/ui/gui/psppire-var-sheet.c
src/ui/gui/psppire-var-sheet.h
src/ui/gui/text-data-import-dialog.c
src/ui/gui/val-labs-dialog.h
src/ui/gui/var-type-dialog.h