Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Sun, 10 Jul 2016 05:47:34 +0000 (07:47 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sun, 10 Jul 2016 05:47:34 +0000 (07:47 +0200)
commitf9b2322d7b0662bd313d9c63450638c39b88be70
treeb5e45c84437d027128ea4dbb667c2dafe86b1bc3
parent55c55aa33d0f90d1b3b58f8b33b3fc54062c553e
parent5ea81ae302c62daadda211d5ce777091ad608c1b
Merge remote-tracking branch 'origin/master' into sheet
src/ui/gui/automake.mk
src/ui/gui/widgets.c