On 3/4/13 16:23 , Oliver Bock wrote: > The problem is that this merge added a change to client/Makefile.am, > without a parent commit containing it that is. Furthermore the merge > dropped two changes without a conflict being present: > - sched/sched_send.cpp in f51b328 > - client/cs_scheduler.cpp in 1a76e1a
FYI, the checkin_notes version of that commit also doesn't reflect the three extra changes which indicates that those changes might have been introduced unintentionally... Oliver _______________________________________________ boinc_dev mailing list [email protected] http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev To unsubscribe, visit the above URL and (near bottom of page) enter your email address.
