xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/deltaScripts
History
Michael James 4a4c2df792 Merge remote-tracking branch 'remotes/origin/unidata_16.2.2' into unidata_16.2.2-osx 
Conflicts:
	cave/build/alertviz/customTargets.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/localization/menus/upperair/index.xml
	cave/com.raytheon.uf.viz.d2d.ui.upperair/plugin.xml
	cave/com.raytheon.uf.viz.dat.feature/feature.xml
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.java
	cm/AWIPS2_NWS/edex/gov.noaa.nws.ost.edex.plugin.binlightning/src/gov/noaa/nws/ost/edex/plugin/binlightning/BinLightningAESKey.properties
	edexOsgi/build.edex/deploy.edex.awips2/.project
	edexOsgi/build.edex/deploy.edex.awips2/.pydevproject
	edexOsgi/build.edex/esb/etc/centralRegistry.sh
	edexOsgi/build.edex/esb/etc/dataprovideragent.sh
	edexOsgi/com.raytheon.edex.plugin.binlightning/utility/edex_static/base/distribution/binlightning.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satFog.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.satellite/utility/common_static/base/derivedParameters/definitions/satMoisture.xml
	edexOsgi/com.raytheon.uf.edex.binlightning.feature/.project
	rpms/awips2.core/Installer.localization/utility/cave_static/bundles/scales/States.xml
2016-11-01 13:21:00 -06:00
..
13.6.1 cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
14.2.1 cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
14.2.1-n3 cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
14.3.1 cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
14.3.3/DR17194 cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
14.4.1 remove deltaScript DR3410 to avoid import as eclipse project 2016-10-31 15:57:04 -05:00
15.1.1 massive grid renaming incl. GFE 2016-05-03 16:14:14 -06:00
16.1.1 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1 2015-07-30 20:53:19 +00:00
16.2.1 Omaha #5605 Fix combinations file retrieval again 2016-04-25 16:13:48 -05:00
16.2.2 Omaha #5783 Typo in delta script 2016-08-30 13:11:02 -05:00
16.3.1/DCS14232 VLab Issue #13015 - DCS 14232, change locarea table's area column to 500 characters. Java changes; fixes #13015 2016-02-08 17:23:42 +00:00
archived ufpy->awips 2016-06-27 17:02:26 -05:00
goesr_deploy cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
.project cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
.pydevproject cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00
deltaScripts.ecl cleanup unused and redundant directories on working branch 2015-12-30 14:02:46 -07:00