Steve Harris f02c1ef71d Merge branch 'ss_builds' (12.12.1-12) into development ... Conflicts: cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java Former-commit-id: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]] Former-commit-id: f6988eefff Former-commit-id: 6287b32e7d		2012-12-11 08:45:53 -06:00
..
config	12.6.1-9 baseline	2012-07-10 07:53:49 -05:00
db	Merge branch 'ss_builds' (12.12.1-12) into development	2012-12-11 08:45:53 -06:00
discrete	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
exception	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
grid	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
point	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
python	12.11.1-4 baseline	2012-10-16 13:27:07 -05:00
reference	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
request	Merge branch 'ss_builds' (12.12.1-12) into development	2012-12-11 08:45:53 -06:00
sample	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
serialize	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
server	12.6.1-9 baseline	2012-07-10 07:53:49 -05:00
slice	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
textproduct	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
time	12.9.1-4 baseline	2012-08-15 15:19:10 -05:00
type	12.11.1-10 baseline	2012-10-24 15:13:57 -05:00
util	12.11.1-10 baseline	2012-10-24 15:13:57 -05:00
weather	Initial revision of AWIPS2 11.9.0-7p5	2012-01-06 08:55:05 -06:00
weatherelement	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
DiscreteTerm.java	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00
GridDataHistory.java	12.5.1-15 baseline	2012-06-08 13:39:48 -05:00
RemapGrid.java	12.11.1-5 baseline	2012-10-18 15:46:42 -05:00
StatusConstants.java	Moving 12.1.1 into ss_sync	2012-01-19 11:53:12 -06:00