Changeset febf7e in git


Ignore:
Timestamp:
Mar 16, 2009, 8:30:16 PM (14 years ago)
Author:
Christian Eder
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
a8301332fef1b5e1c3b4d9866ef452648141b21e
Parents:
1534d909f0de82118c1ba2d95e184f8f57a83db7
Message:
solved conflicts


git-svn-id: file:///usr/local/Singular/svn/trunk@11564 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/f5gb.cc

    r1534d9 rfebf7e  
    22*  Computer Algebra System SINGULAR     *
    33****************************************/
    4 <<<<<<< f5gb.cc
    5 /* $Id: f5gb.cc,v 1.48 2009-03-16 19:28:07 ederc Exp $ */
    6 =======
    7 /* $Id: f5gb.cc,v 1.48 2009-03-16 19:28:07 ederc Exp $ */
    8 >>>>>>> 1.47
    94/*
    105* ABSTRACT: f5gb interface
Note: See TracChangeset for help on using the changeset viewer.