[med-svn] [nut-nutrition] 04/08: Merge branch 'upstream' into pkg-debian

[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 c44a0876b4103044488cdc4f15c6d67657abbb1d
Merge: b54fd36 44f62be
Author: Wesley J. Landaker <wjl at icecavern.net>
Date:   Sun Apr 12 12:31:23 2009 -0600

    Merge branch 'upstream' into pkg-debian

 README    |  6 +++---
 db.h      |  4 ++--
 food.c    |  2 +-
 meal.c    | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 meal.h    |  2 +-
 nut.1     |  7 +++++-
 nut.html  |  9 ++++++--
 options.c |  9 ++++----
 8 files changed, 90 insertions(+), 23 deletions(-)

diff --cc nut.1
index a6ec4e5,a702381..3c774cc
--- 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.02.07" "" ""
 -.TH "nut" "1" "2009.04.12" "" ""
++.TH "nut\-nutrition" "1" "2009.04.12" "" ""
  .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