On Mon, 17 Dec 2012 05:35:06 -0800 (PST), Nicky Perian wrote: > Henri > I was able to merge and build and verify kokua on aditi; the top 2 commits > are post merge tweaks. I don't know if that can help diff wise but, feel free > to use. > The last upstream merge to kokua was viewer-release, last Monday's merge. > Nicky > https://bitbucket.org/NickyP/kokua-sunshine-external/overview
I'm afraid it doesn't help. What I need to avoid wasting my little free time in this period of the year, is a clean diff with only the *relevant*, *minimal* changes in it. The fact you could merge the sunshine branch with another v3-based viewer doesn't help (you simply merged stuff that is still not validated/adopted/committed to the viewer-development and viewer-beta banches together the (soon) mandatory server side baking code). Regards, Henri. _______________________________________________ Policies and (un)subscribe information available here: http://wiki.secondlife.com/wiki/OpenSource-Dev Please read the policies before posting to keep unmoderated posting privileges
