Mirror of Unidata's AWIPS2.
Find a file
Steve Harris bb335fd675 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1
Conflicts (these are now in ufcore):
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/ext/colormap/ColormappedImage.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
	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.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java


Former-commit-id: 243988d344 [formerly 7e24fd79a1] [formerly 396daac383] [formerly af7fb01f53 [formerly 396daac383 [formerly a6932cbdbee31973374a6e23c08e0e39a23d99d9]]]
Former-commit-id: af7fb01f53
Former-commit-id: aeb0a11344f6daaf21e2b40c8bb422f483add825 [formerly 225da706b7]
Former-commit-id: 9b65077ad9
2014-04-29 16:09:07 -05:00
cave Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1 2014-04-29 16:09:07 -05:00
cots Omaha #3085 - moved common.json and viz.datacube to core and org.codehaus.jackson to core-foss 2014-04-28 16:25:21 -05:00
deltaScripts Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
edexOsgi Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.4.1 2014-04-29 16:09:07 -05:00
javaUtilities Issue #2937 Consolidated LogEntry to string and from string conversions in utility 2014-04-09 18:47:09 -05:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2758 Fix MHSEmulator to pass small files 2014-02-13 15:53:15 -06:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Merge branch 'omaha_14.2.2' (14.2.1-14,15) into development 2014-03-26 16:19:26 -05:00
ncep Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
ost Issue #3017 Update SatSpatialFactory to have more specific methods. 2014-04-15 13:29:05 -05:00
pythonPackages Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
RadarServer Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
rpms Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2889 user who issued change now shows in notification center 2014-04-02 14:06:25 -05:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00