Changeset 2ac2935 in git for libpolys/polys/nc/old.gring.cc

Timestamp:

Dec 7, 2012, 3:41:00 PM (11 years ago)

Author:

Alexander Dreyer <adreyer@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

ec1006cbd9971c4271d05aefada775ef29d762a6

Parents:

7e18d198148353f88708cfa20f738ac338cb1f556554ca42ebe1277c9afe7990970390905a6e1cf0

Message:

Merge conflict resolved

File:

• libpolys/polys/nc/old.gring.cc (modified) (2 diffs)

libpolys/polys/nc/old.gring.cc

@@ -2463 +2463 @@
   matrix M = r->GetNC()->MT[UPMATELEM(i,j,rN)];
   /*  return(M); */
+/*
   int sizeofres;
   if (metric==0)
@@ -2472 +2473 @@
     sizeofres=sizeof(number);
   }
+*/
   matrix res=mpNew(size,size);
   int s;