awips2/edexOsgi/build.edex
Richard Peter 8aa4b0025c Merge branch 'omaha_13.4.1' (13.4.1-11) into development
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 8a78f99345016db3d38c0b846a8a6ccf77fb3e89
2013-05-21 12:11:21 -05:00
..
basebuilds 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
deploy-common Issue #1927 - handle the case where the python illusion does not exist. 2013-05-08 21:27:43 -05:00
edex Issue #1994 - purge any FOSS artifacts deployed to the EDEX plugins directory by Eclipse PDE. 2013-05-20 15:03:33 -05:00
esb Merge branch 'omaha_13.4.1' (13.4.1-11) into development 2013-05-21 12:11:21 -05:00
lib/ant 13.3.1-12 baseline 2013-03-25 13:27:13 -05:00
opt Issue #1989 remove dead files 2013-05-16 10:25:38 -05:00
pdeprops Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
properties Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
rpm/component/edex/includes/edex-ost 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
.pydevproject Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build-docs.xml Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.edex.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
build.xml Issue #1967 - update ant build scripts for Eclipse 3.8 compatibility 2013-05-07 17:54:30 -05:00
deploy-install.xml 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
substitute.xml Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
yajsw-stable-11.04.tar 13.3.1-19 baseline 2013-04-09 08:37:12 -05:00