Richard Peter ae09db35ad 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: 192e5b9be8 [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd] Former-commit-id: 9e3baaa87a		2013-06-04 14:06:53 -05:00
..
.settings	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
localization	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
META-INF	Issue #1977 Merge branch 'omaha_13.4.1' into development	2013-05-06 15:04:23 -05:00
src/com/raytheon/viz/volumebrowser	Merge branch 'omaha_13.4.1' (13.4.1-13) into development	2013-06-04 14:06:53 -05: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.viz.volumebrowser.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00
DataSelectionMenuItems.xml	13.3.1-6 baseline	2013-03-12 08:35:45 -05:00
plugin.xml	13.4.1-6 baseline	2013-05-07 08:47:39 -04:00