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)
commitea17c5b225557fc0760810861451a84dc241d462
treecc60c9c0a8de55994cb7252a9ab94b5b03710616
parentb6493cbb201307a2a5d1ff840a8347d75548cb85
parent6982cc4aef29f7026e75702174efa8091d9badb2
Merge remote branch 'origin/master' into psppsheet
src/ui/gui/automake.mk
src/ui/gui/data-editor.ui
src/ui/gui/find-dialog.c