Mirror of Unidata's AWIPS2.
Find a file
Steve Harris f6988eefff 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: e733dd9d05d3704f86e2a711607a1834df1a56f2
2012-12-11 08:45:53 -06:00
cave Merge branch 'ss_builds' (12.12.1-12) into development 2012-12-11 08:45:53 -06:00
cots Merge "Issue #1325 add missing sourcepath for jts" into development 2012-11-15 11:02:35 -06:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #1292 - delta scripts 2012-11-27 14:05:24 -06:00
edexOsgi Merge branch 'ss_builds' (12.12.1-12) into development 2012-12-11 08:45:53 -06:00
javaUtilities 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
ldm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features 2012-11-28 16:30:10 -06:00
nativeLib Merge branch 'ss_builds' (12.12.1-12) into development 2012-12-11 08:45:53 -06:00
ncep Merge branch 'ss_builds' (12.12.1-12) into development 2012-12-11 08:45:53 -06:00
ost Issue #1257: Update PurgeRules to not be hard linked to path keys 2012-10-31 18:19:44 -05:00
pythonPackages Issue #1332: Update pypies to create/use condensed group structure 2012-11-21 15:27:31 -06:00
RadarServer Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
rpms Merge branch 'ss_builds' (12.12.1-12) into development 2012-12-11 08:45:53 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools Merge branch 'master' (OB12.7.1-8) into development 2012-07-27 14:44:44 -05:00
.gitignore Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00