Richard Peter 93a4917179 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: 9e3baaa87a [formerly f13177a981 [formerly 192e5b9be8] [formerly 9e3baaa87a [formerly ed63eaede59b2b8d388d6fa03394f5e8d91c51dd]]] Former-commit-id: f13177a981 [formerly 192e5b9be8] Former-commit-id: f13177a981 Former-commit-id: c9c02248b3		2013-06-04 14:06:53 -05:00
..
.settings	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
META-INF	13.3.1-12 baseline	2013-03-25 13:27:13 -05:00
src/com/raytheon/uf/viz/stats	Merge branch 'omaha_13.4.1' (13.4.1-13) into development	2013-06-04 14:06:53 -05:00
.classpath	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
.project	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
build.properties	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
com.raytheon.uf.viz.stats.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00
plugin.xml	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00