[Cvs-cvs] ccvs/src ChangeLog client.c [signed-commits2]

[Derek Robert Price]

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         signed-commits2
Changes by:     Derek Robert Price <address@hidden>     05/12/05 22:07:32

Modified files:
        src            : ChangeLog client.c 

Log message:
        * client.c (update_entries): Create timestamp when LAST_MERGE_CONFLICT.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/ChangeLog.diff?only_with_tag=signed-commits2&tr1=1.3306.2.38&tr2=1.3306.2.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/cvs/ccvs/src/client.c.diff?only_with_tag=signed-commits2&tr1=1.433.4.16&tr2=1.433.4.17&r1=text&r2=text