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 f02b7be0897ede628be0f362a6d6c7b3602479bd Merge: d6d3179 5776723 Author: Iain R. Learmonth <[email protected]> Date: Mon Sep 15 18:04:37 2014 +0100 Merge tag 'upstream/20.1' Upstream version 20.1 LICENSE | 4 +- README | 16 +- README.DOS | 2 +- abbrev.h | 2 +- addfood.c | 2 +- addfood.h | 2 +- anameal.c | 2 +- anameal.h | 2 +- blurb | 2 +- db.c | 2 +- db.h | 12 +- fdgrp.h | 2 +- fltk/AddRecipe.cc | 2 +- fltk/AddRecipe.h | 2 +- fltk/AddToMealWidget.cc | 2 +- fltk/AddToMealWidget.h | 2 +- fltk/AnalyzeMeals.cc | 2 +- fltk/AnalyzeMeals.h | 2 +- fltk/BackToMenu.cc | 2 +- fltk/BackToMenu.h | 2 +- fltk/BodyFatValueOutput.cc | 2 +- fltk/BodyFatValueOutput.h | 2 +- fltk/CalorieValueOutput.cc | 2 +- fltk/CalorieValueOutput.h | 2 +- fltk/CancelWidget.cc | 2 +- fltk/CancelWidget.h | 2 +- fltk/DVValueOutput.cc | 2 +- fltk/DVValueOutput.h | 2 +- fltk/DeficNut.cc | 2 +- fltk/DeficNut.h | 2 +- fltk/FoodButton.cc | 2 +- fltk/FoodButton.h | 2 +- fltk/FoodChoice.cc | 2 +- fltk/FoodChoice.h | 2 +- fltk/FoodRanking.cc | 2 +- fltk/FoodRanking.h | 2 +- fltk/FoodSuggestions.cc | 2 +- fltk/FoodSuggestions.h | 2 +- fltk/GOLightButton.cc | 2 +- fltk/GOLightButton.h | 2 +- fltk/GramValueOutput.cc | 2 +- fltk/GramValueOutput.h | 2 +- fltk/MealCountValueOutput.cc | 2 +- fltk/MealCountValueOutput.h | 2 +- fltk/MealFood.cc | 2 +- fltk/MealFood.h | 2 +- fltk/MealFoodValueOutput.cc | 2 +- fltk/MealFoodValueOutput.h | 2 +- fltk/MealValueOutput.cc | 2 +- fltk/MealValueOutput.h | 2 +- fltk/MissMealWidget.cc | 2 +- fltk/MissMealWidget.h | 2 +- fltk/NewRecipeWidget.cc | 2 +- fltk/NewRecipeWidget.h | 2 +- fltk/Nut.cc | 2 +- fltk/Nut.h | 2 +- fltk/NutButton.cc | 2 +- fltk/NutButton.h | 2 +- fltk/NutButtonWidget.cc | 2 +- fltk/NutButtonWidget.h | 2 +- fltk/NutCharts.cc | 2 +- fltk/NutCharts.h | 2 +- fltk/NutValue.cc | 2 +- fltk/NutValue.h | 2 +- fltk/Nut_Box.cc | 2 +- fltk/Nut_Box.h | 2 +- fltk/Nut_Button.cc | 2 +- fltk/Nut_Button.h | 2 +- fltk/Nut_Input.cc | 2 +- fltk/Nut_Input.h | 2 +- fltk/Nut_LightButton.cc | 2 +- fltk/Nut_LightButton.h | 2 +- fltk/Nut_LineChart.cc | 2 +- fltk/Nut_LineChart.h | 2 +- fltk/Nut_MenuButton.cc | 2 +- fltk/Nut_MenuButton.h | 2 +- fltk/Nut_Pack.cc | 2 +- fltk/Nut_Pack.h | 2 +- fltk/Nut_ReturnButton.cc | 2 +- fltk/Nut_ReturnButton.h | 2 +- fltk/Nut_Scroll.cc | 2 +- fltk/Nut_Scroll.h | 2 +- fltk/Nut_ToggleButton.cc | 2 +- fltk/Nut_ToggleButton.h | 2 +- fltk/Nut_ValueOutput.cc | 2 +- fltk/Nut_ValueOutput.h | 2 +- fltk/Nut_Window.cc | 2 +- fltk/Nut_Window.h | 2 +- fltk/OunceValueOutput.cc | 2 +- fltk/OunceValueOutput.h | 2 +- fltk/PCF.cc | 2 +- fltk/PCF.h | 2 +- fltk/PersonalOptions.cc | 12 +- fltk/PersonalOptions.h | 2 +- fltk/PrintMenus.cc | 2 +- fltk/PrintMenus.h | 2 +- fltk/RecordMeals.cc | 2 +- fltk/RecordMeals.h | 2 +- fltk/ServingMenuButton.cc | 2 +- fltk/ServingMenuButton.h | 2 +- fltk/ServingValueOutput.cc | 2 +- fltk/ServingValueOutput.h | 2 +- fltk/TheStory.cc | 2 +- fltk/TheStory.h | 2 +- fltk/TheUsualMenuButton.cc | 2 +- fltk/TheUsualMenuButton.h | 2 +- fltk/TheUsualNameWidget.cc | 2 +- fltk/TheUsualNameWidget.h | 2 +- fltk/ViewFoods.cc | 2 +- fltk/ViewFoods.h | 2 +- fltk/WeightCharts.cc | 2 +- fltk/WeightCharts.h | 2 +- fltk/WeightLogWidget.cc | 2 +- fltk/WeightLogWidget.h | 2 +- fltk/main.cc | 2 +- food.c | 2 +- food.h | 2 +- lookup.h | 2 +- main.c | 3 +- meal.c | 2 +- meal.h | 2 +- menu.c | 2 +- menu.h | 2 +- nut.1 | 6 +- nut.h | 2 +- nut.html | 8 +- nutrient.h | 4 +- options.c | 2 +- options.h | 2 +- preprocess/dbfoodname | 0 preprocess/dbjoin | 4 +- preprocess/dbjoinheaders | 0 preprocess/dbjoinnuts | 0 preprocess/dbjoinweight | 0 preprocess/dbjoinwlib | 0 preprocess/foodedits | 14 + prtmenu.c | 2 +- prtmenu.h | 2 +- ranking.c | 2 +- ranking.h | 2 +- raw.data/WEIGHT.lib | 905 ++++++++++-------- raw.data/{sr26.nut => sr27.nut} | 2017 +++++++++++++++++++++------------------ recmeal.c | 2 +- recmeal.h | 2 +- remmeal.c | 2 +- remmeal.h | 2 +- theusual.c | 2 +- theusual.h | 2 +- trendy.c | 2 +- trendy.h | 2 +- util.c | 2 +- util.h | 2 +- viewfood.c | 2 +- viewfood.h | 2 +- 154 files changed, 1804 insertions(+), 1475 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/nut-nutrition.git _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
