[SCM] an open source computer algebra system branch, master, updated. upstream/3-1-3-1-3664-g4d18530

[Felix Salfelder]

The following commit has been merged in the master branch:
commit 997ec5fce243e5f1c02bc7dadcb320198c84f5fe
Author: Felix Salfelder <felix at salfelder.org>
Date:   Tue Feb 7 23:51:11 2012 +0100

    completed merge.

diff --git a/COPYING b/COPYING
index c3d57f4..7076a0e 100644
--- a/COPYING
+++ b/COPYING
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-                        SINGULAR version 3-1-3
-=======
                         SINGULAR version 3-1-4
->>>>>>> origin/cleanedupstream
 
                      University of Kaiserslautern
 
@@ -10,11 +6,7 @@
 
            Authors: G.-M. Greuel, G. Pfister, H. Schoenemann
 
-<<<<<<< HEAD
-                        Copyright (C) 1986-2011
-=======
                         Copyright (C) 1986-2012
->>>>>>> origin/cleanedupstream
 
 
 
@@ -96,15 +88,9 @@ Hubert Grassmann, Amir Hashemi, Fernando Hernando, Agnes Heydtmann,
 Dietmar Hillebrand, Tobias Hirsch, Markus Hochstetter, Manuel Kauers,
 Simon King, Anen Lakhal, Martin Lamm, Santiago Laplagne, Gregoire
 Lecerf, Francisco Javier Lobillo, Christoph Mang, Thomas Markwig, Bernd
-<<<<<<< HEAD
-Martin, Michael Messollen, Andrea Mindnich, Jorge Martin Morales,
-Thomas Nu"ssler, Tetyana Povalyaeva, Carlos Rabelo, J.-J.
-Salazar-Gonzalez, Alfredo Sanchez-Navarro, Ivor Saynisch, Kristina
-=======
 Martin, Michael Messollen, Andrea Mindnich, Antonio Montes,
 Jorge Martin Morales, Thomas Nu"ssler, Tetyana Povalyaeva, Carlos Rabelo,
 J.-J.  Salazar-Gonzalez, Alfredo Sanchez-Navarro, Ivor Saynisch, Kristina
->>>>>>> origin/cleanedupstream
 Schindelar, Silke Spang, Stefan Steidel, Henrik Strohmayer, Christian
 Stussak, Imade Sulandra, Akira Suzuki, Christine Theis, Enrique Tobis,
 Maryna Viazovska, Alberto Vigneron-Tenorio, Moritz Wenk, Denis Yanovich,
diff --git a/IntegerProgramming/COPYING b/IntegerProgramming/COPYING
index 6e63e60..dc75b78 100644
--- a/IntegerProgramming/COPYING
+++ b/IntegerProgramming/COPYING
@@ -7,11 +7,7 @@
 
            Authors: G.-M. Greuel, G. Pfister, H. Schoenemann
 
-<<<<<<< HEAD
-                        Copyright (C) 1986-2011
-=======
                         Copyright (C) 1986-2012
->>>>>>> origin/cleanedupstream
 
 
 
diff --git a/IntegerProgramming/si_gmp.h b/IntegerProgramming/si_gmp.h
index 6e36284..2bc6c34 100644
--- a/IntegerProgramming/si_gmp.h
+++ b/IntegerProgramming/si_gmp.h
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
-/* $Id: si_gmp.h 12231 2009-11-02 10:12:22Z hannes $ */
-/* $Id: si_gmp.h 12231 2009-11-02 10:12:22Z hannes $ */
-=======
 /* $Id$ */
 /* $Id$ */
->>>>>>> origin/cleanedupstream
 
 #ifndef INCL_CF_GMP_H
 #define INCL_CF_GMP_H
diff --git a/emacs/.emacs-general b/emacs/.emacs-general
index 8852ba3..f25656f 100644
--- a/emacs/.emacs-general
+++ b/emacs/.emacs-general
@@ -1,9 +1,5 @@
 ;;; Emacs edit mode for this file is  -*- Emacs-Lisp -*-
-<<<<<<< HEAD
-;;; $Id: .emacs-general 12231 2009-11-02 10:12:22Z hannes $
-=======
 ;;; $Id$
->>>>>>> origin/cleanedupstream
 
 ;;;
 ;;; .emacs-general - Emacs initialization file for general emacs
diff --git a/emacs/.emacs-singular b/emacs/.emacs-singular
index 6476b87..57c4f7c 100644
--- a/emacs/.emacs-singular
+++ b/emacs/.emacs-singular
@@ -1,9 +1,5 @@
 ;;; Emacs edit mode for this file is  -*- Emacs-Lisp -*-
-<<<<<<< HEAD
-;;; $Id: .emacs-singular 12231 2009-11-02 10:12:22Z hannes $
-=======
 ;;; $Id$
->>>>>>> origin/cleanedupstream
 
 ;;;
 ;;; .emacs-singular - Emacs initialization file to use for
diff --git a/emacs/cmpl.pl b/emacs/cmpl.pl
index 9b6b495..2f8d658 100755
--- a/emacs/cmpl.pl
+++ b/emacs/cmpl.pl
@@ -1,9 +1,5 @@
 #!/usr/local/bin/perl
-<<<<<<< HEAD
-# $Id: cmpl.pl 12231 2009-11-02 10:12:22Z hannes $
-=======
 # $Id$
->>>>>>> origin/cleanedupstream
 ###################################################################
 #
 # FILE:    cmpl.pl
diff --git a/emacs/lib.pl b/emacs/lib.pl
index 81e3166..6ae1662 100644
--- a/emacs/lib.pl
+++ b/emacs/lib.pl
@@ -1,9 +1,5 @@
 #!/usr/local/bin/perl
-<<<<<<< HEAD
-# $Id: lib.pl 12231 2009-11-02 10:12:22Z hannes $
-=======
 # $Id$
->>>>>>> origin/cleanedupstream
 ###################################################################
 #
 # FILE:    lib.pl
diff --git a/emacs/singular.el b/emacs/singular.el
index 6076c58..aa66bc3 100644
--- a/emacs/singular.el
+++ b/emacs/singular.el
@@ -1,10 +1,6 @@
 ;;; singular.el --- Emacs support for Computer Algebra System Singular
 
-<<<<<<< HEAD
-;; $Id: singular.el 13177 2010-09-13 10:43:12Z hannes $
-=======
 ;; $Id$
->>>>>>> origin/cleanedupstream
 
 ;;; Commentary:
 

-- 
an open source computer algebra system