[singular] 08/09: merge patched-master-3-1-5 into master-3-1-5

[felix salfelder]

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

felix-guest pushed a commit to branch master-3-1-5
in repository singular.

commit bea7f33326d6133accf3e1b58527f04dca284c0d
Merge: e51a6ae 622961f
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Sep 3 22:01:25 2013 +0200

    merge patched-master-3-1-5 into master-3-1-5

 Singular/configure      |  139 ++++++++++++++++++++++-------------------------
 Singular/configure.in   |   11 ++--
 debian/.git-dpm         |    2 +-
 doc/cones.doc           |  106 ++++++++++++++++++------------------
 doc/types.doc           |    2 +-
 factory/cf_util.cc      |   16 ++++++
 factory/cf_util.h       |    1 +
 factory/facBivar.h      |    4 +-
 factory/facFactorize.cc |    2 +-
 factory/facFactorize.h  |    2 +-
 factory/facFqBivar.cc   |    6 +-
 kernel/gring.cc         |   14 +----
 kernel/ring.cc          |   25 +++++++--
 kernel/ring.h           |   10 ++--
 14 files changed, 175 insertions(+), 165 deletions(-)

diff --cc debian/.git-dpm
index 5172cce,0000000..3a29080
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
 +77dc62e5ef186d11b5d376af96bc0b71471387f0
- 77dc62e5ef186d11b5d376af96bc0b71471387f0
++622961fcdb1c5f17be2260b8be5c36d85825660b
 +c2d0b997183a0cc911fdef0861638995bafededc
 +c2d0b997183a0cc911fdef0861638995bafededc
 +singular_3-1-5.dfsg.orig.tar.gz
 +eb6aabf3f389eec6a4605e43e807d946b432c0d9
 +19748109

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