Merge remote branch 'origin/master' into import-gui
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 9 May 2013 01:40:54 +0000 (03:40 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 9 May 2013 01:40:54 +0000 (03:40 +0200)
commit19cf39ef8802208ca67fc3e1cf12ce4b239aaabf
treeead4e28a0e000f61c5870bc0d0b8040c882544c2
parent0ed82886f29b9c00f5068c69f021bd51c76488df
parent5b59146f8d060754b14eba415dcc9066d8bc7b02
Merge remote branch 'origin/master' into import-gui
src/ui/gui/automake.mk
src/ui/gui/page-assistant.c
src/ui/gui/page-file.c
src/ui/gui/text-data-import-dialog.c
src/ui/gui/text-data-import.ui