Merge remote branch 'origin/master' into psppsheet 20121201032009/pspp
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 23 Nov 2012 14:18:42 +0000 (15:18 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 23 Nov 2012 14:18:42 +0000 (15:18 +0100)
1  2 
src/ui/gui/automake.mk
src/ui/gui/data-editor.ui
src/ui/gui/find-dialog.c

Simple merge
Simple merge
Simple merge