Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 96ba08115a Merge branch 'omaha_13.3.1' into development
Conflicts (auto resolved):
	cave/com.raytheon.uf.viz.cots.feature/feature.xml
	edexOsgi/com.raytheon.uf.edex.cots.feature/feature.xml


Former-commit-id: 8db22baf07 [formerly 310474ae9b] [formerly 36df63be5c] [formerly cb5ea76f98 [formerly 36df63be5c [formerly 45de49bd241f4bc53b266792c0ae6cb4658527a7]]]
Former-commit-id: cb5ea76f98
Former-commit-id: 676c62cd28cf7ed4ed697282c1db1cda2b6aebde [formerly 104e6e79e8]
Former-commit-id: d00dc0d174
2013-03-20 13:45:11 -05:00
cave Merge branch 'omaha_13.3.1' into development 2013-03-20 13:45:11 -05:00
cots Merge branch 'omaha_13.3.1' into development 2013-03-20 13:45:11 -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.3.1-8) into omaha_13.3.1 2013-03-18 16:43:22 -05:00
edexOsgi Merge branch 'omaha_13.3.1' into development 2013-03-20 13:45:11 -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 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 Issue #1416: added the python package shapely 2012-12-17 15:27:43 -06:00
nativeLib Issue #1663 - updated libpq.so for the native hydro applications 2013-03-14 10:40:18 -05:00
ncep Merge branch 'omaha_13.3.1' into development 2013-03-20 13:45:11 -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-18 16:52:00 -05:00
RadarServer Issue #1804 Switch bzip2 cots package to jbzip2. 2013-03-20 13:05:54 -05:00
rpms Issue #1741 - ensure that awips2-cave and/or awips2-edex will always be installed before awips2-common-base 2013-03-19 13:27:38 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1796 Fixed the test 2013-03-19 17:22:00 -05:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Merge branch 'ss_sync' into 9-Wes2Bridge 2012-02-27 15:58:49 -06:00