Chris Radek wrote: > On Fri, Mar 11, 2011 at 05:19:07AM +0000, Chris Morley wrote: > >> I will confirm the components etc before this happens. >> 2.4 will not go into master or 2.5 anymore will it? >> when I merge pncconf into 2.5 then any merges from 2.4 >> will have a big glade conflict >> > > 2.4 is merged into 2.5, and 2.5 is merged into master. > > There will not be conflicts merging 2.4 into 2.5 unless you make > changes to the glade in 2.4. > > > When is the integrators manual going to get updated? I committed changes to the file ..../docs/src/drivers/pico_ppmc.lyx on January 9, 2011, and they still have not shown up on the public version of the document.
Jon ------------------------------------------------------------------------------ Colocation vs. Managed Hosting A question and answer guide to determining the best fit for your organization - today and in the future. http://p.sf.net/sfu/internap-sfd2d _______________________________________________ Emc-developers mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/emc-developers
