awips2/edexOsgi/com.raytheon.uf.common.serialization
Richard Peter 9e3baaa87a 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
..
.settings Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
META-INF Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects 2013-02-27 11:50:38 -06:00
python Issue #1638 Refactored viz/edex/common core projects to removed common and viz dependencies on edex projects 2013-02-27 11:50:38 -06:00
src/com/raytheon/uf/common/serialization Merge branch 'omaha_13.4.1' (13.4.1-13) into development 2013-06-04 14:06:53 -05:00
unit-test Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -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
.pydevproject 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.uf.common.serialization.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
component-deploy.xml Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
dstypes.list Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00