xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/build.edex
History
Ron Anderson ba7a25a88f Merge branch 'master_14.1.1' into solutions 
Conflicts:
	cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionVectorResource.java
	cave/com.raytheon.uf.viz.xy.timeseries/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.xy.varheight/src/com/raytheon/uf/viz/xy/varheight/rsc/VarHeightResource.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/PROCESSED_DATA.xml
	edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/CoreDao.java

Change-Id: I8c5fabf90d864db89a0db7d5f3f6f54c1e5f44a5

Former-commit-id: 9f121ec921a2f8635c48f005ddb71787ad6bf166
2014-01-13 17:45:20 -06:00
..
basebuilds 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
deploy-common 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
edex 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
esb Merge branch 'master_14.1.1' into solutions 2014-01-13 17:45:20 -06:00
lib/ant 13.5.1-4 baseline 2013-06-28 09:46:25 -04:00
opt 14.1.1-4 baseline 2013-10-28 10:55:16 -04: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