Richard Peter e748b7c1e5 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900 Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]] Former-commit-id: 32957285fc Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]] Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466] Former-commit-id: 938e39a0fc		2014-04-28 16:27:40 -05:00
..
.settings	13.1.2-2 baseline	2013-01-06 14:32:24 -06:00
META-INF	Issue #2574 fix DatabaseQuery conversion of grid coverage objects.	2013-12-16 14:31:44 -06:00
res/scripts	Issue #2574 Add DataURIFieldConverter for GridCoverages.	2013-11-25 12:17:36 -06:00
src/com/raytheon/uf/common/gridcoverage	Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1	2014-04-28 16:27:40 -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.common.gridcoverage.ecl	13.3.1-1 baseline	2013-02-20 16:19:40 -06:00