2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 <2012> 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 | Index | 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 <2012> 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 |
<== Date ==> | <== Thread ==> |
---|
Subject: | Re: [Merge] lp:~epics-core/epics-base/msi-join into lp:epics-base |
From: | Andrew Johnson <[email protected]> |
To: | Andrew Johnson <[email protected]> |
Date: | Fri, 01 Jun 2012 21:22:17 -0000 |
For some reason Launchpad is not showing all of the revisions that this merge will incorporate; the full set of commits on this branch goes back to revno 12104 inclusive. The diff below is also a bit confused by the 3.15 source tree reorganization, but if you ignore the embedded conflict markers it does seem to show all of the changes. -- https://code.launchpad.net/~epics-core/epics-base/msi-join/+merge/108420 Your team EPICS Core Developers is requested to review the proposed merge of lp:~epics-core/epics-base/msi-join into lp:epics-base.