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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge