Merge remote branch 'origin/sourceview'
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
1  2 
configure.ac
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-syntax-window.c

diff --cc configure.ac
Simple merge
Simple merge
Simple merge
Simple merge