CVSROOT: /cvs/GiNaC Module name: GiNaC Changes by: roberto@cs.unipr.it 2003-11-10 15:08:45

Modified files: ginac : basic.h function.h function.pl input_lexer.cc input_parser.cc symbol.h ginsh : ginsh_lexer.cc

Log message: Conflicts resolved.

Patches: http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/basic.h.diff?cvsroot=G... http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/function.h.diff?cvsroo... http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/function.pl.diff?cvsro... http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/input_lexer.cc.diff?cv... http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/input_parser.cc.diff?c... http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/symbol.h.diff?cvsroot=... http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginsh/ginsh_lexer.cc.diff?cv...