Mirror of Unidata's AWIPS2.
Find a file
Brian.Dyke d23acbdd48 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 0ea874227f20f9f7fe19fc8371e10711023c3f53
2014-03-14 11:13:30 -04:00
cave Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 2014-03-14 10:15:53 -04:00
cots Issue #2581 fix local storm report delta script and unique constraint 2014-01-15 09:50:35 -06:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2581 add dataURI back to LocalStormReport for 14.2.1, fix RAIN 2014-01-30 12:02:42 -06:00
edexOsgi Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 2014-03-14 11:13:30 -04:00
javaUtilities Issue #2788 Fix topo for large areas. 2014-02-13 10:10:34 -06:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 14.1.1-4 baseline 2013-10-28 10:55:16 -04:00
MHSEmulator Issue #2009: Fix NullPointerException in SocketServer start up. 2013-07-23 13:57:38 -05:00
msi Merge branch 'master_14.1.1' into master_14.2.1 2014-03-07 09:01:09 -05:00
nativeLib ASM #377 - Baseline National River Location Database fails 2014-03-07 13:12:11 -05:00
ncep Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 2014-03-10 15:14:59 -04:00
ost Merge branch 'master_14.1.1' (-21) into 'master_14.2.1' (-8) 2014-03-06 08:39:43 -06:00
pythonPackages ASM #349 - Workaround for QPID-5569 2014-03-07 14:58:09 +00:00
RadarServer ASM #74 - Fix RadarServer configuration import utility JAR dependency 2014-03-06 17:07:23 +00:00
rpms Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 2014-03-14 11:13:30 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2386 fixed spatial overlap rule application. 2014-02-25 09:22:08 -06:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00