Mirror of Unidata's AWIPS2.
Find a file
Richard Peter fa6247baf7 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java

Former-commit-id: ae3ea75cbf [formerly 1318f53902] [formerly b8e42dabc0 [formerly 90066bd215f4c547dfd483cec7c415c1e6fccece]]
Former-commit-id: b8e42dabc0
Former-commit-id: aa9e16b038
2013-01-14 17:38:38 -06:00
cave Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 2013-01-14 17:38:38 -06:00
cots Issue #1441 Break net.dods dependency on AWIPS code 2013-01-10 12:06:39 -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 Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 2013-01-14 17:38:38 -06:00
javaUtilities Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
ldm Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly. 2012-12-18 09:00:46 -06: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 #1416: added the python package shapely 2012-12-17 15:27:43 -06:00
nativeLib Issue #1262: 2012-12-16 21:40:26 -06:00
ncep Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 2013-01-14 17:38:38 -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 #1416: added the python package shapely 2012-12-17 15:27:43 -06:00
RadarServer Issue #1302 Merge branch '5-Data_Delivery' into development 2012-11-01 13:36:06 -05:00
rpms Issue #1408: Merge branch 'ss_builds' (13.1.2-8) into development 2013-01-14 17:38:38 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1420 - Additional changes and cleanup 2013-01-11 14:38:34 -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