[liblinear] 04/08: Merge branch 'upstream' into dfsg

[Christian Kastner]

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

chrisk-guest pushed a commit to branch dfsg
in repository liblinear.

commit 1c197a1ff8db2145031a6ab0436613b68a9bfbac
Merge: 4e213a8 42ddc2e
Author: Christian Kastner <debian at kvr.at>
Date:   Thu Sep 16 19:16:24 2010 +0200

    Merge branch 'upstream' into dfsg
    
    Conflicts:
    	windows/liblinear.dll
    	windows/libsvmread.mexw32
    	windows/libsvmwrite.mexw32
    	windows/predict.exe
    	windows/predict.mexw32
    	windows/train.exe
    	windows/train.mexw32

 README         |  47 ++++++++------
 linear.cpp     | 199 +++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 linear.h       |   2 +-
 matlab/train.c |   7 +-
 train.c        |   7 +-
 5 files changed, 228 insertions(+), 34 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/liblinear.git