Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Thu, 3 Aug 2017 05:37:27 +0000 (07:37 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Thu, 3 Aug 2017 05:37:27 +0000 (07:37 +0200)
commit5dbf5abcbed01f04422d4dead1c0ae0bb7efde4f
tree768e4f959f6a1eba95121fe94e08fe8f5e336ed6
parentb5a56f8d1592fd0d9bf981d71e28851c4e733fef
parent65481c834dca537af5851fa2b7efe209f09af613
Merge remote-tracking branch 'origin/master' into sheet
NEWS
configure.ac
lib/automake.mk
src/ui/gui/automake.mk
src/ui/gui/text-data-import.ui
src/ui/gui/widgets.c