Richard Peter 192e5b9be8 Merge branch 'omaha_13.4.1' (13.4.1-13) into development ... Conflicts: cave/com.raytheon.viz.ui.personalities.awips/META-INF/MANIFEST.MF edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/JAXBManager.java edexOsgi/com.raytheon.uf.common.stats/src/com/raytheon/uf/common/stats/StatsRecord.java edexOsgi/com.raytheon.uf.edex.stats/res/spring/edex-process-stats.xml edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-graph-request.xml edexOsgi/com.raytheon.uf.edex.stats/res/spring/stats-request.xml edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/AggregateManager.java edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/AggregateRecordDao.java edexOsgi/com.raytheon.uf.edex.stats/src/com/raytheon/uf/edex/stats/dao/StatsDao.java tests/unit/com/raytheon/uf/edex/stats/AggregateManagerTest.java Former-commit-id: ed63eaede59b2b8d388d6fa03394f5e8d91c51dd		2013-06-04 14:06:53 -05:00
..
display	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
rsc	Merge branch 'omaha_13.4.1' (13.4.1-13) into development	2013-06-04 14:06:53 -05:00
Activator.java	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00