Merge remote branch 'origin/sourceview'

author John Darrington <john@darrington.wattle.id.au>

Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)

committer John Darrington <john@darrington.wattle.id.au>

Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
author John Darrington <john@darrington.wattle.id.au>
Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
committer John Darrington <john@darrington.wattle.id.au>
Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
diff --cc configure.ac
Simple merge
diff --cc src/ui/gui/automake.mk
Simple merge
diff --cc src/ui/gui/psppire-data-window.c
Simple merge
diff --cc src/ui/gui/psppire-syntax-window.c
Simple merge
author	John Darrington <john@darrington.wattle.id.au>
	Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
committer	John Darrington <john@darrington.wattle.id.au>
	Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/automake.mk	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/psppire-data-window.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/gui/psppire-syntax-window.c	patch \|	diff1 \|	diff2 \|	blob \| history