Merge commit 'origin/master' into charset
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 8 Apr 2009 01:14:57 +0000 (09:14 +0800)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 8 Apr 2009 01:14:57 +0000 (09:14 +0800)
commit537fdeb3702c011e05d7826a8d556a7beeba2605
tree0fca0afe18eb0187b088a87e1461ce7fdb4bbf5b
parent60426b863b7b51f6295c2884478ae02863d3b79d
parent7fbfc32fc3c636959b0a25b3e76609f86519e84a
Merge commit 'origin/master' into charset

Conflicts:

src/ui/gui/psppire-data-editor.c
src/data/psql-reader.c
src/ui/gui/psppire-data-editor.c
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-dictview.c
src/ui/gui/psppire-var-sheet.c