Steve Harris 4de63454fc Merge tag 'OB_15.1.1-16' into omaha_16.1.1 ... 15.1.1-16 Conflicts: cave/com.raytheon.viz.gfe/build.properties cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/AbstractGridResource.java (moved to ufcore) edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py Former-commit-id: 9f115206966a85c409a731e51bb4360c44ccc7fc		2015-06-05 15:38:00 -05:00
..
META-INF	Omaha #3897 Better handle invalid Section 2 data.	2015-01-12 11:27:55 -05:00
res	Issue #2906 removed wmo header, timeObs and timeNominal from sfcobs HDF5	2014-04-22 09:10:45 -05:00
src/com/raytheon/edex/plugin/sfcobs	Merge tag 'OB_14.4.1-47' into int_15.1.1	2015-05-29 15:42:40 -04:00
unittest/com/raytheon/edex/plugin/sfcobs/decoder	Omaha #3629 Replacing matchElement()	2014-09-30 11:39:40 -05:00
utility	13.5.1-2 baseline	2013-06-17 15:01:22 -04: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	Merge tag 'OB_15.1.1-16' into omaha_16.1.1	2015-06-05 15:38:00 -05:00
com.raytheon.edex.plugin.sfcobs.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00