Merge commit 'origin/master' into charset
authorJohn Darrington <john@darrington.wattle.id.au>
Wed, 1 Apr 2009 01:58:49 +0000 (09:58 +0800)
committerJohn Darrington <john@darrington.wattle.id.au>
Wed, 1 Apr 2009 01:58:49 +0000 (09:58 +0800)
1  2 
src/ui/gui/psppire.c

Simple merge