Re: Build error after complicated merge - fixed :)

2011-09-25 Thread Stefan Seifert
On Friday 23 September 2011 19:00:24 you wrote: > On Thursday 22 September 2011 20:38:34 you wrote: > > I would suggest you build master fully, checkout the branch and call > > './opsc --core', followed by a 'make realclean' before reconfiguring > > and rebuilding. This is how I bootstrap ops, sinc

Re: Build error after complicated merge

2011-09-22 Thread Peter Lobsinger
On Thu, Sep 22, 2011 at 3:23 PM, Stefan Seifert wrote: > Hi, > > I'm trying to pick up Chandler's threading work in the gsoc_threads branch. > First step would be to bring it up to date wrt current master (pre > kill_threads to be precise). I branched green_threads off gsoc_threads and > merged ma

Build error after complicated merge

2011-09-22 Thread Stefan Seifert
Hi, I'm trying to pick up Chandler's threading work in the gsoc_threads branch. First step would be to bring it up to date wrt current master (pre kill_threads to be precise). I branched green_threads off gsoc_threads and merged master into it. Cleaned up all conflicts and tried to build but th