So, presumably the C++ (python? ruby?) merged in cleanly from trunk, .Net from M2.1, Java broker from M2.1 relatively ok, and all the nasty conflicts were mainly around Java client? Sounds promising...
On 08/02/2008, Aidan Skinner <[EMAIL PROTECTED]> wrote: > > On Feb 8, 2008 9:45 AM, Rupert Smith <[EMAIL PROTECTED]> wrote: > > > Aidan, what is the scope of the merge so far? Just java broker, all > java, or > > all? > > Everything. The commit failed after I left due to inconsistent > newlines in a couple of files, should be going in shortly. > > - Aidan > -- > aim/y!:aidans42 g:[EMAIL PROTECTED] > http://aidan.skinner.me.uk/ > "Almost everything is imitation... The most original writers borrowed > from one another." - Voltaire >
