Merge remote branch 'savannah/master' into sourceview
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 1 Jul 2011 12:54:36 +0000 (14:54 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 1 Jul 2011 12:54:36 +0000 (14:54 +0200)
commitfe8dc2171009e90d2335f159d05f7e6660e24780
tree7ceaa3fe67fa11985366cbb10646591000f2768c
parenta258e53c63a08b0ec48aea8f03808eb651729424
parent840f7bace2423e6d240320ab308f0fbaa8c559f1
Merge remote branch 'savannah/master' into sourceview

Conflicts:
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-syntax-window.c
src/ui/gui/psppire-syntax-window.h
INSTALL
configure.ac
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-syntax-window.c
src/ui/gui/psppire-syntax-window.h
src/ui/gui/syntax-editor.ui