Merge 'master' into 'gtk3'.

author Ben Pfaff <blp@cs.stanford.edu>

Sat, 16 Nov 2013 18:26:19 +0000 (10:26 -0800)

committer Ben Pfaff <blp@cs.stanford.edu>

Sat, 16 Nov 2013 18:26:19 +0000 (10:26 -0800)
author Ben Pfaff <blp@cs.stanford.edu>
Sat, 16 Nov 2013 18:26:19 +0000 (10:26 -0800)
committer Ben Pfaff <blp@cs.stanford.edu>
Sat, 16 Nov 2013 18:26:19 +0000 (10:26 -0800)
diff --cc configure.ac
Simple merge
diff --cc src/ui/gui/automake.mk
Simple merge
diff --cc src/ui/gui/main.c
Simple merge
diff --cc src/ui/gui/psppire-data-sheet.c
Simple merge
diff --cc src/ui/gui/psppire-data-window.c
Simple merge
diff --cc src/ui/gui/psppire-window.c
Simple merge
author	Ben Pfaff <blp@cs.stanford.edu>
	Sat, 16 Nov 2013 18:26:19 +0000 (10:26 -0800)
committer	Ben Pfaff <blp@cs.stanford.edu>
	Sat, 16 Nov 2013 18:26:19 +0000 (10:26 -0800)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/automake.mk	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/psppire-data-sheet.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/psppire-data-window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/psppire-window.c	patch \|	diff1 \|	diff2 \|	blob \| history