Closed nikhilgupta10 closed 8 years ago
nikhilgupta10 imported these comments from Sourceforge: The user laurmarinovici does not exist anymore. Therefore assigning this to afisher1. "dchassin":Picking up from ticket 823. Validate of trunk merge on Linux, win32 and x64 ok. Ready to merge into branch/3.1 after merge into trunk is completed.,
"dchassin":- status: new --> assigned
Resolution: none --> validate ,
"dchassin":Merge and validate linux into trunk is ok. Note that code was copied because of tree conflict merging ticket/852 into trunk (again!?!). So separate validate on win32 and x64 was done with an intermediate (risky) commit to trunk. Sorry, but that's the quickest way to get from here to there until the tree conflict problems with trunk branches are resolved.
Ready to merge and validate on branch/3.1.,
"andyfisher":- assigned_to: Andy Fisher --> Laurentiu Marinovici ,
"andyfisher":,
"laurmarinovici":- status: assigned --> closed ,
"laurmarinovici":Manually merged changes into 3.1, validated, and committed.,
Changes to schedule.c and schedule.h are easier to merge into trunk than vice-versa.,