[liblinear] 08/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 2d2cb4d5a50e8561768d998bb2420f920955f7b9
Merge: 7ba884a f947901
Author: Christian Kastner <debian at kvr.at>
Date:   Tue Feb 18 02:25:28 2014 +0100

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

 COPYRIGHT               |   2 +-
 Makefile                |   1 -
 Makefile.win            |   2 +-
 README                  |  16 ++++---
 linear.cpp              | 119 +++++++++++++++++++++++++++++-------------------
 matlab/README           |   3 +-
 matlab/libsvmread.c     |  49 ++++++++++----------
 matlab/libsvmwrite.c    |  16 ++++++-
 matlab/make.m           |   4 +-
 matlab/predict.c        | 100 ++++++++++++++++++++++++----------------
 matlab/run.m            |   4 --
 matlab/train.c          |  35 +++++++++-----
 predict.c               |  50 +++++++++++---------
 python/README           |   8 +++-
 python/liblinear.py     |  48 +++++++++++--------
 python/liblinearutil.py |  69 ++++++++++++++++------------
 train.c                 |  72 +++++++++++++++--------------
 tron.cpp                |   8 ++--
 18 files changed, 356 insertions(+), 250 deletions(-)

diff --cc Makefile
index d700802,7a74e26..5326279
--- a/Makefile
+++ b/Makefile
@@@ -27,7 -28,10 +27,6 @@@ tron.o: tron.cpp tron.
  linear.o: linear.cpp linear.h
  	$(CXX) $(CFLAGS) -c -o linear.o linear.cpp
  
 -blas/blas.a: blas/*.c blas/*.h
 -	make -C blas OPTFLAGS='$(CFLAGS)' CC='$(CC)';
--
  clean:
 -	make -C blas clean
  	make -C matlab clean
  	rm -f *~ tron.o linear.o train predict liblinear.so.$(SHVER)

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