On Sunday 20 December 2009 12:36:54 Ximin Luo wrote: > I've merged everything from Bombe, nextgens, saces. These all had no conflicts > except the fork from nextgens, which I fixed like this: > http://gist.github.com/260463 > > It builds correctly, and seems to run fine. > > Here's everything that's left: > > > master (forked) > > http://github.com/ljb/fred-staging/commit/a1691abccde11c5793b6cd54fccfed3196e8b44b > too many conflicts > > > master (forked) > > http://github.com/kurmiashish/fred-staging/commit/1a53286552459ab17241608c70dee1cb772ee33f > too many conflicts. is this obsolete from GSoC?
This needs merging manually. Most of it has been, but there is a bit more that needs it. > > > web-pushing (forked) > > http://github.com/j16sdiz/fred/commit/6ae65c119f9ac4e9f9cf09d45666451e2bd3bc22 > a few conflicts, but i left this out because there is a *LOT* of additions. > GWT > stuff? Ooooh, what is this? > > > datastore-revamp > > http://github.com/j16sdiz/fred/commit/3de38a64203fe43f2709f2a26ff38ac256cc55b8 > too many conflicts > > > executor > > http://github.com/j16sdiz/fred/commit/f02a25942a1bafe0348859053e36577e46bddd32 > has big warning on latest commit -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 835 bytes Desc: This is a digitally signed message part. URL: <https://emu.freenetproject.org/pipermail/devl/attachments/20100108/ecfd1def/attachment.pgp>
