xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/build.edex
History
Steve Harris 146dc3aec7 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java

Former-commit-id: 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 33b4901c09 [formerly 8c5026314c] [formerly 99ae9bdc10] [formerly 038b284066 [formerly 99ae9bdc10 [formerly 03ba5101d6f277b55173f72c2a63869e9dc31c3f]]]]
Former-commit-id: 038b284066
Former-commit-id: 00b3ad8eb6 [formerly 1da31a86dc] [formerly c9abc2fce0e20d37683d43d809074ccd92db5423 [formerly c8ba2b1ae6]]
Former-commit-id: c07303fea0c9c3e107dabbeefbd395be90d9018f [formerly 84edac842e]
Former-commit-id: 9d263bc542
2014-08-26 16:25:21 -05:00
..
basebuilds 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
deploy-common Omaha #3339 - allow deployment of a WA-specific esb directory to provide EDEX configuration. 2014-07-10 11:16:19 -05:00
edex Omaha #3132 Fix ohd merge issues. 2014-06-02 13:40:26 -05:00
esb Omaha #3541 Fixed ebxml copy of request service endpoint and moved http service path to setup.env 2014-08-26 11:32:20 -05:00
lib/ant 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
opt Omaha #3475 - PostgreSQL Upgrade. 2014-08-12 15:10:39 -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 Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1 2014-08-26 16:25:21 -05:00
deploy-install.xml Omaha #3428 - Add timestamp to end of main 2014-07-24 14:32:02 -05: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