Dustin Johnson 08fd67e94a 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: 069c8d4788 [formerly d27bce13c2] [formerly bff32bbe58] [formerly 0d1d663f41 [formerly bff32bbe58 [formerly 2f676ffcab1c9efa612a52283d05e56f9c748569]]] Former-commit-id: 0d1d663f41 Former-commit-id: 96aa1003fe8c19de9bb5ccd77ca2429b1e310a1c [formerly e25b7c312b] Former-commit-id: 5d5dbe27e1		2012-11-14 14:41:57 -06:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
META-INF	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
res	Merge branch 'ss_builds' (12.12.1-4) into development	2012-11-14 14:41:57 -06:00
src/com/raytheon/edex	Merge branch 'ss_builds'(12.12.1-1) into development	2012-11-13 16:00:19 -06:00
unit-test/com/raytheon/edex/units/satellite	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
utility	12.12.1-1 baseline	2012-11-07 12:41:20 -06:00
.classpath	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
com.raytheon.edex.plugin.satellite.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00