xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
2192 commits 31 branches 40 tags 3.8 GiB
Java 75.8%
Python 18%
HTML 4.5%
Shell 1.3%
PLpgSQL 0.1%
Find a file
Steve Harris bb88c2133a Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
	rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE

Change-Id: I6b2513155d566aa09571c280b46cf309028a9861

Former-commit-id: d997aeaee4 [formerly 2a0e399dc8 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: 2a0e399dc8
Former-commit-id: 979d6a5d8c
2013-03-27 18:21:05 -05:00
cave Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 2013-03-27 18:21:05 -05:00
cots 13.3.1-14 baseline 2013-03-27 17:59:34 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Merge branch 'master_13.3.1' (13.2.1-10) into omaha_13.3.1 2013-03-20 16:06:20 -05:00
edexOsgi Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 2013-03-27 18:21:05 -05:00
javaUtilities Issue #1809 - update for yajsw compatibility 2013-03-20 16:46:03 -05: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 #1832 fix getNumPy() error handling 2013-03-26 18:30:19 -05:00
ncep 13.3.1-14 baseline 2013-03-27 17:59:34 -05:00
ost Issue #1257: Update PurgeRules to not be hard linked to path keys 2012-10-31 18:19:44 -05:00
pythonPackages Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 2013-03-13 13:56:33 -05:00
RadarServer 13.3.1-14 baseline 2013-03-27 17:59:34 -05:00
rpms Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1 2013-03-27 18:21:05 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 2013-03-13 13:56:33 -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