[med-svn] [nut-nutrition] 07/08: Merge branch 'upstream' into pkg-debian
Iain Learmonth
irl-guest at moszumanska.debian.org
Fri Jun 6 22:44:46 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 d18249da5c614013c455dc85b8030ae51baf53df
Merge: dc8a272 aa45f39
Author: Wesley J. Landaker <wjl at icecavern.net>
Date: Sat May 8 09:07:16 2010 -0600
Merge branch 'upstream' into pkg-debian
Conflicts:
Makefile
nut.1
Makefile | 2 +-
README | 18 +-
README.DOS | 8 +-
abbrev.h | 6 +-
addfood.c | 2 +-
addfood.h | 2 +-
anameal.c | 26 +-
anameal.h | 2 +-
blurb | 2 +-
db.c | 122 +-
db.h | 11 +-
fdgrp.h | 8 +-
food.c | 73 +-
food.h | 5 +-
lookup.h | 416 +-
main.c | 2 +-
meal.c | 118 +-
meal.h | 3 +-
menu.c | 52 +-
menu.h | 2 +-
nut.1 | 55 +-
nut.h | 243 +-
nut.html | 58 +-
nutrient.h | 6 +-
options.c | 132 +-
options.h | 5 +-
preprocess/README | 12 +-
preprocess/dbabbrev | Bin 20978 -> 0 bytes
preprocess/dbjoin | 4 +-
preprocess/dbjoinheaders | 17 +-
preprocess/foodedits | 25 +-
preprocess/namedits | 11 +-
prtmenu.c | 3 +-
prtmenu.h | 2 +-
ranking.c | 2 +-
ranking.h | 2 +-
raw.data/WEIGHT.lib | 628 +-
raw.data/{sr21.nut => sr22.nut} | 14950 +++++++++++++++++++-------------------
recmeal.c | 11 +-
recmeal.h | 2 +-
remmeal.c | 2 +-
remmeal.h | 2 +-
theusual.c | 2 +-
theusual.h | 2 +-
trendy.c | 2 +-
trendy.h | 2 +-
util.c | 4 +-
util.h | 2 +-
viewfood.c | 2 +-
viewfood.h | 2 +-
50 files changed, 8866 insertions(+), 8204 deletions(-)
diff --cc nut.1
index 3c774cc,7711c3e..b4f2f5b
--- a/nut.1
+++ b/nut.1
@@@ -4,11 -4,11 +4,11 @@@
.\" LP paragraph
.\" IP indented paragraph
.\" TP hanging label
- .TH "nut\-nutrition" "1" "2009.04.12" "" ""
-.TH "nut" "1" "2010.05.02" "" ""
++.TH "nut\-nutrition" "1" "2010.05.02" "" ""
.SH "NAME"
-.B nut \- analyze meals with the USDA Nutrient Database
+.B nut\-nutrition \- analyze meals with the USDA Nutrient Database
.SH "SYNOPSIS"
-.B nut [dbname]
+.B nut\-nutrition [dbname]
.SH "DESCRIPTION"
.LP
.B NUT
--
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