Richard Peter e748b7c1e5 Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 ... Conflicts: cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900 Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]] Former-commit-id: 32957285fc Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]] Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466] Former-commit-id: 938e39a0fc		2014-04-28 16:27:40 -05:00
..
actions	Issue #2969 Fixed error when Topo parm is unloaded.	2014-04-02 09:07:22 -05:00
colortable
config
constants
contours
core	Merge branch 'master_14.2.2' into master_14.3.1	2014-04-25 11:06:11 -04:00
dialogs	Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1	2014-04-28 16:27:40 -05:00
edittool	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
export	Issue #2847: Add option to export only selected parms to GFE KML export dialog.	2014-04-03 11:30:59 -05:00
gridmanager	merge 14.2.1-3 into asm-14.2.2	2014-01-27 15:27:49 -05:00
ifpimage	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
interpolation	Merge branch 'master_14.1.2' into master_14.2.1	2014-04-09 16:00:54 -05:00
jobs	14.1.1-4 baseline	2013-10-28 10:55:16 -04:00
log
makehazard	13.5.1-2 baseline	2013-06-17 15:01:22 -04:00
menu
perspective	Merge branch 'omaha_14.2.1' into development	2014-01-21 12:36:54 -06:00
preferences
procedures	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
product
python	Issue #2033: Move GFE-specific localization files and other misc. code out of	2013-09-16 12:50:04 -05:00
query	Issue #2033: Move GFE-specific localization files and other misc. code out of	2013-09-16 12:50:04 -05:00
rsc	Issue #2737 Make iscMosaic remove data from ISC when grids are deleted.	2014-04-03 16:56:36 -05:00
sampler	Issue #2508 Added DiscreteGridSlice.getKeys(), deprecated getKey()	2013-10-31 14:04:55 -05:00
smartscript
smarttool	ASM #84 - fix default time range for smart tools	2014-03-14 14:39:56 -04:00
statusline
tasks
temporaleditor
textformatter	Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8)	2014-03-06 08:39:43 -06:00
textproduct	Issue #2033: Move GFE-specific localization files and other misc. code out of	2013-09-16 12:50:04 -05:00
types
ui	Merge branch 'omaha_14.2.1' (14.2.1-8) into development	2014-02-27 15:18:26 -06:00
visual	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
vtec	Merge branch 'master_14.1.1' into master_14.2.1	2014-02-18 10:45:20 -06:00
ActivateSiteComponent.java
Activator.java	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
BaseGfePyController.java
GfeClient.java	Merge branch 'master_14.1.2' into master_14.2.1	2014-04-09 16:00:54 -05:00
GFEException.java
GFEOperationFailedException.java
GFEPreference.java
GFEServerException.java
GridManagerView.java	14.1.1-14 baseline	2014-01-06 14:02:30 -05:00
IConfigurationChange.java
IConfigurationChangeListener.java
LocalizationConstants.java
PreferenceConstants.java
PreferenceInitializer.java
PythonPreferenceStore.java	Issue #2729 Fixed error handling in loadPreferences method of loadConfig.py	2014-04-03 12:42:42 -05:00
PythonUtil.java
QuickSetPropertyTester.java
ServiceBackupComponent.java