[lrslib] 02/16: Merge tag 'upstream/0.51_r919'

[David Bremner]

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

bremner pushed a commit to branch master
in repository lrslib.

commit c42a0feacf08efbb309a70ffaeecd3cf5f2db9cc
Merge: 7829735 468e28a
Author: David Bremner <bremner at debian.org>
Date:   Sat Dec 6 15:49:15 2014 +0100

    Merge tag 'upstream/0.51_r919'
    
    Conflicts:
    	lrsgmp.c
    	lrslib.c
    	lrslib.h
    	lrsmp.h
    
    force conflicts to take upstream version. All of our patches were pushed upstream

 2gnash.c                              |   73 --
 2nash.c                               |    0
 COPYING                               |    4 +-
 buffer.c                              |   96 ---
 chdemo.c                              |    0
 cleanthreads                          |    1 +
 cp5.ext                               |   21 +
 cube.ext                              |    1 +
 cube.ine                              |    2 +
 ext/test/cyclic25_13.ext => cycle.ext |   78 +-
 ext/metric/cp4.ext                    |    0
 ext/metric/cp5.ext                    |    0
 ext/metric/cp6.ext                    |    0
 ext/metric/cp7.ext                    |    0
 ext/metric/mp5.ext                    |    0
 ext/test/cut16_11.ext                 |    0
 ext/test/cut32_16.ext                 |    0
 ext/test/cyclic25_13.ext              |    0
 ext/test/tsp5.ext                     |    0
 float2rat.c                           |    0
 fourier.c                             |    0
 game                                  |    0
 game1                                 |    0
 game2                                 |    0
 ine/cube.ine                          |    0
 ine/cube2.ine                         |    0
 ine/cubetop.ine                       |    0
 ine/cyc.ine                           |    0
 ine/lp1.ine                           |    0
 ine/lp2.ine                           |    0
 ine/metric/cp4.ine                    |    0
 ine/metric/cp5.ine                    |    0
 ine/metric/cp6.ine                    |    0
 ine/metric/mp5.ine                    |    0
 ine/metric/mp6.ine                    |    0
 ine/mit/mit.ine                       |    4 +-
 ine/mit/mit288-281.ine                |    0
 ine/mit/mit31-20.ine                  |    2 +
 ine/mit/mit41-16.ine                  |    0
 ine/mit/mit708-9.ine                  |    0
 ine/mit/mit71-61.ine                  |    0
 ine/mit/mit90-86.ine                  |    0
 ine/test/cross4.ine                   |    0
 ine/test/cyclic17_8.ine               |    0
 ine/test/diamond.ine                  |    0
 ine/test/in0.ine                      |    0
 ine/test/in1.ine                      |    0
 ine/test/in2.ine                      |    0
 ine/test/in3.ine                      |    0
 ine/test/in4.ine                      |    0
 ine/test/in5.ine                      |    0
 ine/test/in6.ine                      |    0
 ine/test/in7.ine                      |    0
 ine/test/kkd38_6.ine                  |    0
 ine/test/kq20_11.ine                  |    0
 ine/test/kq20_11a.ine                 |    0
 ine/test/metric40_11.ine              |    0
 ine/test/metric80_16.ine              |    0
 ine/test/mit31_20.ine                 |    0
 ine/test/trunc10.ine                  |    0
 ine/test/trunc7.ine                   |    0
 ine/test/tsp5.ine                     |    0
 ine/truss2.ine                        |    0
 lp.ine                                |   16 -
 lpdemo.c                              |    0
 lrs.c                                 |    6 +-
 lrs.c => lrs.cpp                      |    7 +-
 lrsgmp.c                              |  150 +++-
 lrsgmp.h                              |   22 +-
 lrslib.c                              | 1412 +++++++++++++++++++++++++++------
 lrslib.h                              |  406 +++++-----
 lrslib.html                           |  308 -------
 lrslong.c                             |  107 ++-
 lrslong.h                             |   30 +-
 lrsmp.c                               |  242 ++++--
 lrsmp.h                               |   47 +-
 makefile                              |  243 +++---
 ine/mit/mit.ine => mit.ine            |    1 -
 ine/mit/mit31-20.ine => mit31-20.ine  |    4 +-
 mp5.ine                               |    4 +-
 nash.c                                |    9 +-
 plrs.cpp                              |  442 +++++++++++
 plrs.hpp                              |   46 ++
 rat2float.c                           |    0
 readme                                |   60 ++
 redtest.ine                           |   17 -
 redund.c                              |    0
 runp                                  |   20 +
 runp2                                 |   10 +
 setupnash.c                           |    0
 setupnash2.c                          |    0
 vedemo.c                              |    0
 92 files changed, 2624 insertions(+), 1267 deletions(-)

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