Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 1b5f2c2f54 Merge branch 'ss_builds' (12.11.1-3) into development
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPointComparator.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java

Former-commit-id: 6659a96ac6 [formerly 8b7665418a] [formerly 0a42cb87a4] [formerly 63ffdac2b7 [formerly 0a42cb87a4 [formerly 5ebfa0e773d325c57ac8097b46537817d5d47842]]]
Former-commit-id: 63ffdac2b7
Former-commit-id: 317e3e14ff2323c9c71ba64860412db38413e9d9 [formerly 63da835aef]
Former-commit-id: f0121b6fa8
2012-10-16 09:20:37 -05:00
cave Merge branch 'ss_builds' (12.11.1-3) into development 2012-10-16 09:20:37 -05:00
cots Issue #1253 - re-compiled the shared libraries with the -O2 flag 2012-10-09 14:40:36 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #1117: Modify D2DGridDatabase to retrieve parms from GribParamInfo 2012-09-13 15:39:58 -05:00
edexOsgi Merge branch 'ss_builds' (12.11.1-3) into development 2012-10-16 09:20:37 -05:00
javaUtilities Issue #1130 - merging Wes2Bridge into Common Baseline Delivery II (cherry pick) 2012-09-05 14:44:36 -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 Revert "12.6.1-10 baseline" 2012-06-21 08:51:08 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi Merge branch 'ss_builds' (12.9.1-5) into development_on_ss_builds 2012-08-21 16:17:58 -05:00
nativeLib Issue #1253 - re-compiled the shared libraries with the -O2 flag 2012-10-09 14:40:36 -05:00
ncep Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path. 2012-10-15 09:52:14 -05:00
ost Issue #1210 - Correct to use IDataRecord 2012-09-25 10:06:21 -05:00
pythonPackages Issue #1257: Change Radar and GFE hdf5 file layouts. Update PluginDao to use ThreadLocal for date formatting instead of sync blocks. Fix for NSharp with different grid path. 2012-10-15 09:52:14 -05:00
RadarServer 12.10.1-4 baseline 2012-09-13 12:08:11 -05:00
rpms Issue #1265 Enable configuration of compression on all current HttpClient traffic, but disabled by default 2012-10-12 15:16:27 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore 12.10.1-4 baseline 2012-09-13 12:08:11 -05:00