awips2/edexOsgi/com.raytheon.edex.plugin.bufrua
Ron Anderson 0e5c626fa9 Merge branch 'master_14.1.1' into solutions
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: de5fd8d1f9 [formerly 2e8cbade9f] [formerly 0bde38cef3] [formerly 0bde38cef3 [formerly ba7a25a88f]] [formerly de5fd8d1f9 [formerly 2e8cbade9f] [formerly 0bde38cef3] [formerly 0bde38cef3 [formerly ba7a25a88f]] [formerly 62c445d872 [formerly 0bde38cef3 [formerly ba7a25a88f] [formerly 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166]]]]]
Former-commit-id: 62c445d872
Former-commit-id: d49d76954f [formerly 46735c9afe] [formerly dca7f21f7b] [formerly 3c3cb649277ee002582b7c8b0a2575dd02973dd2 [formerly 7dfb50efe6365a72db2ee0a724484df4f74fef25] [formerly dca7f21f7b [formerly 624375267e]]]
Former-commit-id: 7f4b9758abf4ad64dd120eecaefe18dc06b2d656 [formerly 550b8ecf890edc1befc4cc61d160811052a5c599] [formerly 77c132f706 [formerly 5076217d8f]]
Former-commit-id: 77c132f706
Former-commit-id: f33f5aec85
2014-01-13 17:45:20 -06:00
..
.settings Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
META-INF Issue #2142 Got log4j out of edex. 2013-07-15 14:26:15 -05:00
res 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
src/com/raytheon/edex/plugin/bufrua Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
utility Merge branch 'master_14.2.1' (14.1.1-13) into omaha_14.2.1 2013-12-17 21:04:53 -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.bufrua.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00