[med-svn] [nut-nutrition] 02/02: Merge tag 'upstream/19.1'
Iain Learmonth
irl-guest at moszumanska.debian.org
Fri Jun 6 22:55:37 UTC 2014
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 450a4af1f33bdcf4f2e6596837ad29e710b54eb7
Merge: 3e0767b 3d2d703
Author: Iain R. Learmonth <irl at fsfe.org>
Date: Fri Jun 6 23:55:06 2014 +0100
Merge tag 'upstream/19.1'
Upstream version 19.1
Conflicts:
Makefile
nut.1
nut.xpm
CREDITS | 5 +
Makefile | 65 +-
README | 76 +-
README.DOS | 60 +-
abbrev.h | 6 +-
addfood.c | 14 +-
addfood.h | 11 +-
anameal.c | 155 +-
anameal.h | 13 +-
blurb | 2 +-
db.c | 286 +-
db.h | 30 +-
fdgrp.h | 4 +-
fltk/AddRecipe.cc | 322 ++
fltk/AddRecipe.h | 58 +
fltk/AddToMealWidget.cc | 80 +
anameal.h => fltk/AddToMealWidget.h | 28 +-
fltk/AnalyzeMeals.cc | 204 +
fltk/AnalyzeMeals.h | 61 +
addfood.h => fltk/BackToMenu.cc | 54 +-
anameal.h => fltk/BackToMenu.h | 27 +-
addfood.h => fltk/BodyFatValueOutput.cc | 41 +-
anameal.h => fltk/BodyFatValueOutput.h | 23 +-
fltk/CalorieValueOutput.cc | 54 +
anameal.h => fltk/CalorieValueOutput.h | 27 +-
addfood.h => fltk/CancelWidget.cc | 46 +-
anameal.h => fltk/CancelWidget.h | 29 +-
fltk/DVValueOutput.cc | 256 +
anameal.h => fltk/DVValueOutput.h | 24 +-
addfood.h => fltk/DeficNut.cc | 42 +-
anameal.h => fltk/DeficNut.h | 24 +-
fltk/FoodButton.cc | 58 +
anameal.h => fltk/FoodButton.h | 26 +-
fltk/FoodChoice.cc | 258 +
addfood.h => fltk/FoodChoice.h | 52 +-
fltk/FoodRanking.cc | 468 ++
fltk/FoodRanking.h | 61 +
fltk/FoodSuggestions.cc | 209 +
addfood.h => fltk/FoodSuggestions.h | 50 +-
fltk/GOLightButton.cc | 59 +
anameal.h => fltk/GOLightButton.h | 24 +-
addfood.h => fltk/GramValueOutput.cc | 44 +-
anameal.h => fltk/GramValueOutput.h | 24 +-
fltk/Makefile | 52 +
addfood.h => fltk/MealCountValueOutput.cc | 33 +-
anameal.h => fltk/MealCountValueOutput.h | 21 +-
fltk/MealFood.cc | 74 +
addfood.h => fltk/MealFood.h | 47 +-
fltk/MealFoodValueOutput.cc | 56 +
anameal.h => fltk/MealFoodValueOutput.h | 24 +-
fltk/MealValueOutput.cc | 105 +
addfood.h => fltk/MealValueOutput.h | 40 +-
fltk/MissMealWidget.cc | 123 +
anameal.h => fltk/MissMealWidget.h | 29 +-
addfood.h => fltk/NewRecipeWidget.cc | 45 +-
anameal.h => fltk/NewRecipeWidget.h | 29 +-
fltk/Nut.cc | 349 ++
fltk/Nut.h | 66 +
addfood.h => fltk/NutButton.cc | 43 +-
anameal.h => fltk/NutButton.h | 24 +-
fltk/NutButtonWidget.cc | 243 +
addfood.h => fltk/NutButtonWidget.h | 47 +-
fltk/NutCharts.cc | 176 +
addfood.h => fltk/NutCharts.h | 47 +-
fltk/NutValue.cc | 204 +
fltk/NutValue.h | 63 +
prtmenu.h => fltk/Nut_Box.cc | 17 +-
ranking.h => fltk/Nut_Box.h | 22 +-
prtmenu.h => fltk/Nut_Button.cc | 17 +-
ranking.h => fltk/Nut_Button.h | 22 +-
prtmenu.h => fltk/Nut_Input.cc | 17 +-
ranking.h => fltk/Nut_Input.h | 22 +-
prtmenu.h => fltk/Nut_LightButton.cc | 17 +-
anameal.h => fltk/Nut_LightButton.h | 21 +-
addfood.h => fltk/Nut_LineChart.cc | 47 +-
anameal.h => fltk/Nut_LineChart.h | 24 +-
prtmenu.h => fltk/Nut_MenuButton.cc | 17 +-
anameal.h => fltk/Nut_MenuButton.h | 21 +-
prtmenu.h => fltk/Nut_Pack.cc | 19 +-
ranking.h => fltk/Nut_Pack.h | 24 +-
prtmenu.h => fltk/Nut_ReturnButton.cc | 17 +-
anameal.h => fltk/Nut_ReturnButton.h | 21 +-
prtmenu.h => fltk/Nut_Scroll.cc | 18 +-
ranking.h => fltk/Nut_Scroll.h | 24 +-
prtmenu.h => fltk/Nut_ToggleButton.cc | 17 +-
anameal.h => fltk/Nut_ToggleButton.h | 21 +-
fltk/Nut_ValueOutput.cc | 55 +
anameal.h => fltk/Nut_ValueOutput.h | 24 +-
addfood.h => fltk/Nut_Window.cc | 50 +-
ranking.h => fltk/Nut_Window.h | 24 +-
addfood.h => fltk/OunceValueOutput.cc | 44 +-
anameal.h => fltk/OunceValueOutput.h | 24 +-
fltk/PCF.cc | 190 +
addfood.h => fltk/PCF.h | 44 +-
fltk/PersonalOptions.cc | 1054 ++++
addfood.h => fltk/PersonalOptions.h | 46 +-
addfood.h => fltk/PrintMenus.cc | 52 +-
anameal.h => fltk/PrintMenus.h | 27 +-
fltk/RecordMeals.cc | 450 ++
fltk/RecordMeals.h | 77 +
fltk/ServingMenuButton.cc | 104 +
addfood.h => fltk/ServingMenuButton.h | 41 +-
fltk/ServingValueOutput.cc | 58 +
anameal.h => fltk/ServingValueOutput.h | 27 +-
fltk/TheStory.cc | 145 +
addfood.h => fltk/TheStory.h | 50 +-
fltk/TheUsualMenuButton.cc | 128 +
anameal.h => fltk/TheUsualMenuButton.h | 24 +-
fltk/TheUsualNameWidget.cc | 88 +
anameal.h => fltk/TheUsualNameWidget.h | 28 +-
fltk/ViewFoods.cc | 371 ++
fltk/ViewFoods.h | 71 +
fltk/WeightCharts.cc | 146 +
fltk/WeightCharts.h | 54 +
fltk/WeightLogWidget.cc | 125 +
addfood.h => fltk/WeightLogWidget.h | 45 +-
fltk/main.cc | 103 +
food.c | 150 +-
food.h | 27 +-
lookup.h | 400 +-
main.c | 15 +-
meal.c | 550 +-
meal.h | 18 +-
menu.c | 136 +-
menu.h | 10 +-
nut.1 | 149 +-
nut.h | 237 +-
nut.html | 149 +-
nut.xpm | 883 ---
nuticon.png | Bin 0 -> 6816 bytes
nuticon.xpm | 51 +
nutrient.h | 6 +-
options.c | 1339 +++--
options.h | 66 +-
preprocess/Makefile | 5 +
preprocess/README | 15 +-
preprocess/dbfoodname | 0
preprocess/dbjoin | 11 +-
preprocess/dbjoinheaders | 15 +-
preprocess/dbjoinnuts | 0
preprocess/dbjoinweight | 0
preprocess/dbjoinwlib | 0
preprocess/dbjw.c | 4 +
preprocess/foodedits | 58 +
preprocess/namedits | 15 +-
prtmenu.c | 51 +-
prtmenu.h | 12 +-
ranking.c | 4 +-
ranking.h | 10 +-
raw.data/FOOD_DES.txt | 0
raw.data/NUT_DATA.txt | 1 -
raw.data/WEIGHT.lib | 4112 ++++++++------
raw.data/WEIGHT.txt | 0
raw.data/sr22.nut | 7538 -------------------------
raw.data/sr26.nut | 8463 +++++++++++++++++++++++++++++
recmeal.c | 132 +-
recmeal.h | 12 +-
remmeal.c | 7 +-
remmeal.h | 10 +-
theusual.c | 18 +-
theusual.h | 10 +-
trendy.c | 40 +-
trendy.h | 12 +-
util.c | 11 +-
util.h | 10 +-
viewfood.c | 21 +-
viewfood.h | 10 +-
167 files changed, 21775 insertions(+), 12612 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/nut-nutrition.git
More information about the debian-med-commit
mailing list