Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 47cde9bd09 Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/skewt/bkgd/NsharpSkewTBackground.java

Former-commit-id: 4c4c79036c [formerly 36261cb095] [formerly 753a5213ab] [formerly 0cd7e56e65 [formerly 753a5213ab [formerly 7b68942012eaf060f364f1e474b2b93379e1b3d6]]]
Former-commit-id: 0cd7e56e65
Former-commit-id: 2726614c378a7a21453ace53443d019d65cea76e [formerly d5bcdb0015]
Former-commit-id: bca46a1354
2013-03-12 16:04:23 -05:00
cave Merge branch 'omaha_13.3.1' into development 2013-03-12 16:04:23 -05:00
cots Issue #1739 - remove reference to non-existent junit version 2013-03-01 10:26:25 -06:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #1782 Merge branch 'master_13.3.1' into omaha_13.3.1 2013-03-12 15:48:34 -05:00
edexOsgi Merge branch 'omaha_13.3.1' into development 2013-03-12 16:04:23 -05:00
javaUtilities Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance 2013-02-27 16:19:58 -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 Merge branch 'omaha_13.3.1' into development 2013-03-12 16:04:23 -05:00
ncep Merge branch 'omaha_13.3.1' into development 2013-03-12 16:04:23 -05:00
ost Issue #1257: Update PurgeRules to not be hard linked to path keys 2012-10-31 18:19:44 -05:00
pythonPackages Merge branch 'omaha_13.3.1' into development 2013-03-12 16:04:23 -05:00
RadarServer 13.3.1-6 baseline 2013-03-12 08:35:45 -05:00
rpms Merge branch 'omaha_13.3.1' into development 2013-03-12 16:04:23 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1778 Watch for bandwidth configuration changes 2013-03-12 12:02:09 -05: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