Dustin Johnson 5d5dbe27e1 Merge branch 'ss_builds' (12.12.1-4) into development ... Conflicts: ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71 Former-commit-id: d27bce13c2 [formerly bff32bbe58] [formerly 0d1d663f41 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]] Former-commit-id: 0d1d663f41 Former-commit-id: e25b7c312b		2012-11-14 14:41:57 -06:00
..
scripts	12.12.1-4 baseline	2012-11-14 14:19:20 -06:00
spring	Issue #1308 Wrote custom OSGI spring handler that could support multiple XML contexts per bundle, merge dependency contexts and scan res spring folder like EDEX. Two changes were required, one for menu generation registration and one for apache beanutils converter registration.	2012-11-07 10:44:42 -06:00