awips2/edexOsgi/build.edex
Steve Harris 708485427e Merge branch 'omaha_14.2.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.obs/res/spring/obs-ingest.xml

Former-commit-id: 873bd6b889 [formerly 7d94859f45aaa3d732cbb25fc55348996cfe481c]
Former-commit-id: f60aba35d6
2014-03-07 15:43:40 -06:00
..
basebuilds 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
deploy-common Issue #2756 install script for collaboration http server 2014-03-03 14:07:01 -06:00
edex Issue #2885 Update PDE build to Java 1.7. Fix code that is now an error in Java 1.7. 2014-03-06 10:38:30 -06:00
esb Merge branch 'omaha_14.2.1' into development 2014-03-07 15:43:40 -06:00
lib/ant 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
opt VLab Issue #2866 - EDEX and EDEX Common delivery for 14.2.1 2014-01-24 10:14:17 -05:00
pdeprops Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
properties Issue #2500 - the list of web applications to deploy is no longer hard-coded in deploy-install. 2013-10-28 14:50:28 -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 14.1.1-8 baseline 2013-11-13 12:32:17 -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