Merge remote-tracking branch 'origin/master' into sheet
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 12 Aug 2016 16:40:23 +0000 (18:40 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 12 Aug 2016 16:40:23 +0000 (18:40 +0200)
commitb8a262a5ea1c5011eeb42d72365620f53ee1a7bc
tree93690c0ff4dc4bd281e56564797be3831ec9b08e
parent4246294842a8abedecaaf55aa87507225f03f58c
parent51854163ce4f22d4f703ae80062b56fa4e94143e
Merge remote-tracking branch 'origin/master' into sheet
src/ui/gui/psppire-dict.c