Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 5ec1c01d3a Merge branch 'omaha_13.3.1' into development
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/reference/MapManager.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/notify/GfeIngestNotificationFilter.java
	edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/util/TimeUtil.java

Former-commit-id: 437a04011a [formerly 140765a43e [formerly 4a7059ac9b104116fef4d0dab9a0108fb61b5a5c]]
Former-commit-id: 140765a43e
Former-commit-id: 736bb45741
2013-04-01 12:19:04 -05:00
cave Merge branch 'omaha_13.3.1' into development 2013-04-01 12:19:04 -05:00
cots Merge branch 'omaha_13.3.1' into development 2013-04-01 12:19:04 -05:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Issue #1802 Refactored DD transaction management 2013-03-25 15:15:38 -05:00
edexOsgi Merge branch 'omaha_13.3.1' into development 2013-04-01 12:19:04 -05:00
javaUtilities Merge branch 'omaha_13.3.1' into development 2013-03-26 10:12:34 -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 Issue #1663 - awips2-database will no longer install site-specific databases. 2013-03-21 09:50:48 -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-04-01 12:19:04 -05:00
ncep Merge branch 'omaha_13.3.1' into development 2013-04-01 12:19:04 -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-04-01 12:19:04 -05:00
RadarServer Issue #1804 Switch bzip2 cots package to jbzip2. 2013-03-20 13:05:54 -05:00
rpms Merge branch 'omaha_13.3.1' into development 2013-04-01 12:19:04 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1802 Fixes related to DD transaction refactor 2013-03-27 17:12:52 -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