Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 1f6b440afd Merge AWIPS2 master branch (13.2.1-19) into master
All conflicts overridden by 'theirs' merge - all of AWIPS2 master

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
	edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
	rpms/awips2.core/Installer.ldm/component.spec

Former-commit-id: fcb5db91f4 [formerly 4b2462390e] [formerly 4861007a03] [formerly fcb5db91f4 [formerly 4b2462390e] [formerly 4861007a03] [formerly dab32b0413 [formerly 4861007a03 [formerly 9cab4557a50e2bcda09365a86b54e5e5613f0a57]]]]
Former-commit-id: dab32b0413
Former-commit-id: 527c41b81e [formerly 8a7bb1f4c8] [formerly 56fd104754441c4f44c1479b829750c7abdf97ba [formerly 4bb5d51847]]
Former-commit-id: 32ec482d1bfceac5d107dfad27733f16c6901fef [formerly d1962bef6b]
Former-commit-id: c217183793
2013-04-04 08:22:05 -05:00
cave 13.2.1-19 baseline 2013-04-01 10:11:24 -04:00
cots 13.2.1-6 baseline 2013-02-07 16:38:44 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts 13.2.1-12 baseline 2013-03-07 13:43:04 -05:00
edexOsgi 13.2.1-19 baseline 2013-04-01 10:11:24 -04:00
javaUtilities 13.1.2-6 baseline 2013-01-06 14:55:11 -06: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 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
nativeLib 13.2.1-6 baseline 2013-02-07 16:38:44 -05:00
ncep 13.2.1-10 baseline 2013-02-25 10:11:00 -05:00
ost 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
pythonPackages 13.2.1-10 baseline 2013-02-25 10:11:00 -05:00
RadarServer 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
rpms 13.2.1-10 baseline 2013-02-25 10:11:00 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests 13.2.1-12 baseline 2013-03-07 13:43:04 -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