Merging Branches into 3.15

From EPICSWIKI
Revision as of 21:57, 17 August 2011 by AndrewJohnson (talk | contribs)
(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)

Merge order already used once by ANJ:

  • lp:~anj/epics-base/reorg-src
    This is a modified and possibly re-based version of lp:~mdavidsaver/epics-base/reorg-src
  • lp:~anj/epics-base/epicsEvent-api
  • lp:~anj/epics-base/process-get
  • lp:~ralph-lange/epics-base/server-side-plugins
    I already re-based this branch once onto a recent 3.14, but I don't think I got it right; I broke the tests in db/test in one of the re-base commits, so I didn't complete this merge.
Retrieved from "https://wiki-ext.aps.anl.gov/epics/index.php?title=Merging_Branches_into_3.15&oldid=1897"