xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe
History
Steve Harris bf9a0fa5de Merge branch 'omaha_14.3.1' into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/localization/bundles/maps/Cities.xml
	cave/com.raytheon.uf.viz.core.maps/src/com/raytheon/uf/viz/core/maps/scales/MapScalesManager.java
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/AlarmDisplayWindow.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.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/D2DGridDatabase.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/util/GribModelLookup.java
	edexOsgi/com.raytheon.edex.utilitysrv/src/com/raytheon/edex/services/LocalizationStreamHandler.java
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/ActiveTable.py

Former-commit-id: f7d474895366eb23ae5eef242a4568f911435aa3
2014-08-04 22:20:29 -05:00
..
cache/gridlocations 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
config Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-07-14 11:54:53 -05:00
db/dao Omaha #3244 Improved GFE purge error handling 2014-06-12 08:05:56 -05:00
exception 13.3.1-19 baseline 2013-04-09 08:37:12 -05:00
ifpAG Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID 2014-04-22 14:38:54 -05:00
isc Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
log Issue #2307: Remove calls to PythonScript constructor without ClassLoader 2013-09-06 10:16:31 -05:00
paraminfo Issue #2473 Remove deprecated grib functionality 2013-10-15 10:48:29 -05:00
reference Issue #2718 Update to GeoTools 10.5 2014-03-13 11:11:53 -05:00
server Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-08-04 22:20:29 -05:00
smartinit Merge branch 'omaha_14.3.1' into omaha_14.4.1 2014-08-04 22:20:29 -05:00
svcbackup Omaha #2914 - Remove calls to PropertiesFactory 2014-07-17 15:41:38 -05:00
textproducts 13.3.1-10 baseline 2013-03-20 15:53:01 -05:00
util Issue #2361 Get some of GFE away from using the global JAXB context, and in the process refactored JAXBManager 2013-10-01 11:25:45 -05:00
watch Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 2014-07-01 15:34:39 -05:00
GfePluginInitializer.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
GridTypeUserType.java Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
StatusConstants.java Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00