[flint] 02/03: merge patched-master-gmp into master-gmp

[felix salfelder]

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

felix-guest pushed a commit to branch master-gmp
in repository flint.

commit f33d69aa9d15e9ac44a11c9d2d28ecb156dd1542
Merge: a6c62c6 1bccef7
Author: Felix Salfelder <felix at salfelder.org>
Date:   Sat Aug 31 21:18:02 2013 +0200

    merge patched-master-gmp into master-gmp

 debian/.git-dpm                     |    4 +-
 fft.h                               |   42 +++++++++++--
 fft/combine_bits.c                  |    4 +-
 fft/convolution.c                   |   51 ++++++++-------
 fft/mul_fft_main.c                  |    2 +-
 fft/mul_mfa_truncate_sqrt2.c        |    2 +-
 fft/mul_truncate_sqrt2.c            |    7 ++-
 fft/mulmod_2expp1.c                 |    7 ++-
 fft/profile/p-mul_fft_main.c        |    4 +-
 fft/split_bits.c                    |    8 +--
 flint.h                             |   24 +++++++
 mpn_extras.h                        |   55 ++++++++++++++--
 mpn_extras/mulmod_2expp1_basecase.c |  117 +++++++++++++++++++++++++++++++++++
 13 files changed, 277 insertions(+), 50 deletions(-)

diff --cc debian/.git-dpm
index 1b00fed,0000000..a80430f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- f00a9c49075e5a42deaabae528a48a108b42ecce
- f00a9c49075e5a42deaabae528a48a108b42ecce
++1bccef7df68bbf6cffb594dca8863a91e7b1aa7e
++1bccef7df68bbf6cffb594dca8863a91e7b1aa7e
 +f00a9c49075e5a42deaabae528a48a108b42ecce
 +f00a9c49075e5a42deaabae528a48a108b42ecce
 +flint-2.3.orig.tar.gz
 +58534b28ba30e63b183476b2b914cb767d1ec919
 +830837

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