Re: [Semanticscuttle-devel] Privatekey

[Christian W. <cw...@cw...>]

Hello Mark,


I merged the master branch into your privatekey branch so that it got
the latest API fixes and unittest helpers.
Your earlier whitespace changes made merging a tough job; I had to
manually resolve conflicts in about 15 files :/

After merging, tests did not run because automatic merge
apparently didn't work for the testbase class, but I fixed it and now
the unit tests do work again.

I did not do any manual browser tests yet, so things may be broken.
Merging was nevertheless necessary to ease merging into the master
branch once the privatekey feature is finished.


-- 
Regards/Mit freundlichen Grüßen
Christian Weiske

-=≡ Geeking around in the name of science since 1982 ≡=-