[gmp-ecm] 72/77: Merge branch 'upstream'

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository gmp-ecm.

commit fe21fc91e6f5796f2464d49f9baab346fd87b2bc
Merge: 77b5a81 ba6a90c
Author: Laurent Fousse <laurent at komite.net>
Date:   Sat Jul 13 22:22:55 2013 -0700

    Merge branch 'upstream'
    
    Conflicts:
    	ChangeLog
    	INSTALL
    	INSTALL-ecm
    	Makefile.in
    	NEWS
    	TODO
    	aclocal.m4
    	build.vc10/Makefile.am
    	build.vc10/Makefile.in
    	build.vc10/assembler/Makefile.in
    	build.vc10/bench_mulredc/Makefile.in
    	build.vc10/config.h
    	build.vc10/libecm/Makefile.in
    	build.vc9/assembler/Makefile.in
    	champions.h
    	config.guess
    	config.sub
    	configure
    	configure.in
    	ecm-ecm.h
    	ecm-params.h
    	ltmain.sh
    	m4/libtool.m4
    	m4/ltversion.m4
    	mpmod.c
    	mpzspm.c

 ChangeLog                                          | 188 ++++++++
 INSTALL                                            |   9 +-
 INSTALL-ecm                                        |  21 +-
 Makefile.am                                        |   4 +-
 Makefile.in                                        |  98 ++--
 NEWS                                               |  14 +-
 TODO                                               |   2 +-
 aclocal.m4                                         |  72 ++-
 athlon/Makefile.in                                 |  21 +-
 build.vc10/Makefile.am                             |   3 +-
 build.vc10/Makefile.in                             |  22 +-
 build.vc10/assembler/Makefile.in                   |  19 +-
 build.vc10/bench_mulredc/.svn/dir-prop-base        |   6 -
 build.vc10/bench_mulredc/.svn/entries              | 130 -----
 .../.svn/text-base/Makefile.am.svn-base            |   1 -
 .../bench_mulredc.vcxproj.filters.svn-base         |  18 -
 .../.svn/text-base/bench_mulredc.vcxproj.svn-base  | 167 -------
 build.vc10/bench_mulredc/Makefile                  | 366 --------------
 build.vc10/bench_mulredc/Makefile.in               |  19 +-
 build.vc10/config.h                                |  10 +-
 build.vc10/ecm/Makefile.in                         |  19 +-
 build.vc10/libecm/Makefile.in                      |  19 +-
 build.vc10/readme.txt                              |  28 +-
 build.vc10/tests.py                                |  21 +-
 build.vc10/tune/Makefile.in                        |  19 +-
 champions.h                                        |   2 +-
 compile                                            | 195 +++++++-
 config.guess                                       |  49 +-
 config.sub                                         |  65 ++-
 configure                                          | 524 ++++++++++++---------
 configure.in                                       |   2 +-
 depcomp                                            |  74 ++-
 ecm-ecm.h                                          |   2 +-
 ecm-gmp.h                                          |  21 +-
 ecm-impl.h                                         |   4 +-
 ecm-params.h                                       |  36 +-
 ecm.1                                              |  44 +-
 ecm.xml                                            |  12 +-
 factor.c                                           |   2 +-
 install-sh                                         |  29 +-
 ltmain.sh                                          |  95 ++--
 m4/libtool.m4                                      | 264 ++++++++---
 m4/ltoptions.m4                                    |  19 +-
 m4/ltversion.m4                                    |  10 +-
 main.c                                             |  29 +-
 missing                                            |  53 +--
 mpmod.c                                            |  37 +-
 mpzspm.c                                           |   5 +-
 mul_fft.c                                          |  36 +-
 pentium4/Makefile.in                               |  21 +-
 pm1fs2.c                                           |   1 -
 powerpc64/Makefile.in                              |  21 +-
 powerpc64/mulredc.m4                               |  20 +-
 powerpc64/mulredc1.asm                             |  16 +-
 powerpc64/mulredc10.asm                            |  20 +-
 powerpc64/mulredc11.asm                            |  20 +-
 powerpc64/mulredc12.asm                            |  20 +-
 powerpc64/mulredc13.asm                            |  20 +-
 powerpc64/mulredc14.asm                            |  20 +-
 powerpc64/mulredc15.asm                            |  20 +-
 powerpc64/mulredc16.asm                            |  20 +-
 powerpc64/mulredc17.asm                            |  20 +-
 powerpc64/mulredc18.asm                            |  20 +-
 powerpc64/mulredc19.asm                            |  20 +-
 powerpc64/mulredc2.asm                             |  16 +-
 powerpc64/mulredc20.asm                            |  20 +-
 powerpc64/mulredc3.asm                             |  20 +-
 powerpc64/mulredc4.asm                             |  20 +-
 powerpc64/mulredc5.asm                             |  20 +-
 powerpc64/mulredc6.asm                             |  20 +-
 powerpc64/mulredc7.asm                             |  20 +-
 powerpc64/mulredc8.asm                             |  20 +-
 powerpc64/mulredc9.asm                             |  20 +-
 powerpc64/mulredc_1_2.m4                           |  16 +-
 powerpc64/redc.asm                                 |  18 +-
 random.c                                           |  28 +-
 test.pm1                                           |   3 +
 x86_64/Makefile.in                                 |  21 +-
 78 files changed, 1891 insertions(+), 1555 deletions(-)

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