Ron Anderson 0bde38cef3 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: 62c445d872 [formerly 9f121ec921a2f8635c48f005ddb71787ad6bf166] Former-commit-id: ba7a25a88f		2014-01-13 17:45:20 -06:00
..
META-INF	Issue #2208 moving ncep unit tests to tests project	2013-07-25 13:28:27 -05:00
res/spring	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
src/gov/noaa/nws/ncep/edex/plugin/aww	14.1.1-7 baseline	2013-11-06 14:16:14 -05:00
utility	12.12.1-1 baseline	2012-11-07 12:41:20 -06:00
.classpath	Issue #2208 moving ncep unit tests to tests project	2013-07-25 13:28:27 -05:00
.project	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
build.properties	Issue #2207 - fix build issues with ncep unit-test directories	2013-07-26 09:48:44 -05:00
client-includes.dat	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
gov.noaa.nws.ncep.edex.plugin.aww.ecl	12.4.1-4 baseline	2012-04-18 15:18:16 -05:00