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=GiNaC&r1=1.3&r2=1.4 http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/function.h.diff?cvsroot=GiNaC&r1=1.3&r2=1.4 http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/function.pl.diff?cvsroot=GiNaC&r1=1.2&r2=1.3 http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/input_lexer.cc.diff?cvsroot=GiNaC&r1=1.2&r2=1.3 http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/input_parser.cc.diff?cvsroot=GiNaC&r1=1.2&r2=1.3 http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginac/symbol.h.diff?cvsroot=GiNaC&r1=1.3&r2=1.4 http://www.cs.unipr.it/cgi-bin/cvsweb.cgi/GiNaC/ginsh/ginsh_lexer.cc.diff?cvsroot=GiNaC&r1=1.2&r2=1.3