xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cave/com.raytheon.viz.awipstools
History
Steve Harris f4b771ea72 Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml

        Issue #3648:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.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.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java

        Issue #3560:
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
	edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
        Also modified with the resolution of #3560:
        edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java


Former-commit-id: 2616fe04b6 [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]
Former-commit-id: da463c484e
2014-10-03 10:18:34 -05:00
..
.settings Omaha #3356 remove unnecessary usage of ext and global buddy policies 2014-08-04 12:30:55 -05:00
icons 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
localization Issue #2310 Switch awipstools to load using bundles. 2013-09-04 16:05:09 -05:00
META-INF Omaha #3356 remove more unnecessary register buddies and policies 2014-09-03 11:34:10 -05:00
src/com/raytheon/viz/awipstools Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1 2014-10-03 10:18:34 -05:00
.classpath Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
.project Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
build.properties Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
com.raytheon.viz.awipstools.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
plugin.xml Issue #2310 Switch awipstools to load using bundles. 2013-09-04 16:05:09 -05:00