[med-svn] [nut-nutrition] 02/03: Merge tag 'upstream/19.2'

[Iain Learmonth]

This is an automated email from the git hooks/post-receive script.

irl-guest pushed a commit to branch master
in repository nut-nutrition.

commit b50db53a3f19607fdb6877d86804cdf48befbb5f
Merge: c971c25 e14b567
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sun Aug 24 14:56:28 2014 +0100

    Merge tag 'upstream/19.2'
    
    Upstream version 19.2

 README                     |   7 +-
 db.h                       |   4 +-
 fltk/FoodRanking.cc        |   2 +
 fltk/MissMealWidget.cc     |   2 +
 fltk/NutButtonWidget.cc    |   8 +-
 fltk/PCF.cc                |  53 ++++++--
 fltk/PCF.h                 |   2 +-
 fltk/PersonalOptions.cc    |  38 +++---
 fltk/RecordMeals.cc        |   2 +
 fltk/ServingMenuButton.cc  |   2 +
 fltk/TheStory.cc           |   2 +
 fltk/TheUsualMenuButton.cc |   2 +
 main.c                     |   1 -
 meal.c                     | 293 +++++++++++++++++++++++++++++++++++++--------
 nut.1                      |   6 +-
 nut.html                   |   8 +-
 recmeal.c                  |  10 +-
 17 files changed, 338 insertions(+), 104 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/nut-nutrition.git