I'm still looking through the changes so cannot comment yet. I will be around until 10ish, if your back lets try and meet Christoffer Dall wrote: > Hi Brian. > > We have done some more changes to the master branch in connection with > our work with QEMU. These changes might conflict with some of the work > you are currently doing, so please tell me how you wish to proceed > with merging. I can spend some time to merge into the emulate branch > if you like, just tell me how you test the correctness of your latest > work and lets make sure that you have pushed the latest work before I > start merging. Otherwise, if you prefer to merge on your own, of > course, feel free. > > Do you have something you would like to discuss before the meeting > tomorrow with Jason? I am going out for dinner at 8pm, so maybe we can > discuss over e-mail or I can do a late Skype session if you want.... > > > /Christoffer