[Server-devel] olpcrd: Merged IBSS activation with RTC set & delegated leases patches -

[Martin Langhoff]

This is about the merge between Daniel Drake's IBSS activation patch
(at http://dev.laptop.org/ticket/9246 ) and my other antitheft
patches.

When merging these we had bad conflicts between the RTC set code and
the IBSS code. With a bit of TLC, now everything works together.

The resulting code is available in my "olpcrd-rough" repository here:

    http://dev.laptop.org/git/users/martin/olpcrd-rough.git/

cheers,



m
-- 
 martin.langhoff at gmail.com
 martin at laptop.org -- School Server Architect
 - ask interesting questions
 - don't get distracted with shiny stuff  - working code first
 - http://wiki.laptop.org/go/User:Martinlanghoff