2 commits

Author	SHA1	Message	Date
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
Steve Harris	2e3662028f	12.12.1-3 baseline ... Former-commit-id: a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]] Former-commit-id: b3b5e6d28f Former-commit-id: 2797cbcdd0	2012-11-13 17:27:04 -06:00