On 10/22/12 20:41 , Rom Walton wrote: >> I haven't yet checked what mess Rom did in d61d9e8. > > Nothing fancy, I just went back to the commit right before the merge > and copied all the source files and headers from clientgui to a > separate directory. Then switched back to master and copied all the > files back over top of the merged files.
I presume you're talking about c8dd9f7 which you then "undid" manually in d61d9e8, right? Please familiarize yourself with "git revert" since it doesn't require manual copying and retains history. Cheers, 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.
