Mirror of Unidata's AWIPS2.
Find a file
Ron Anderson bbe995a99d Omaha #5229 Fix auto-merge errors
Change-Id: I652d44709a92b8dc474e1be5dab5a1b6e228a8ed

Former-commit-id: 1b634cb275fd62ed659420881842f676bea013b8
2016-01-20 11:19:40 -06:00
build Omaha #4216 Fixed broken multi WA build, DD request router issue, sbnSIm and request sharing same debug port. 2015-12-10 10:34:39 -06:00
cave Omaha #5229 Fix auto-merge errors 2016-01-20 11:19:40 -06:00
crh VLab Issue #12735 - GFS20PostProcessor does not handle CP grids; fixes #12735 2015-11-18 13:21:36 +00:00
deltaScripts Omaha #5253 Remove dataURI from SvrWx plugin 2016-01-19 11:34:57 -06:00
edexOsgi Merge "Omaha #4677 Fix bufrmos location caching" into omaha_16.2.2 2016-01-19 17:17:21 -06:00
javaUtilities Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-06 11:55:00 -06:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization VLab Issue #12697 -DCS18223 Baseline additional maps; fixes #12697 2015-10-26 14:12:40 +00:00
nativeLib Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-13 09:20:51 -06:00
ost Merge branch 'omaha_16.2.1' into omaha_16.2.2 2016-01-06 11:55:00 -06:00
pythonPackages Omaha #5138 Removed pycairo that is not longer used, Moved to local apps repo. 2016-01-06 14:52:20 -06:00
RadarServer Merge "VLab Issue #10351 - DCS17789 add radar TPSF; fixes #10351" into asdt_16.2.1 2015-10-30 15:02:40 +00:00
rpms Omaha #5222 - Add world read to edex start/stop log 2016-01-19 12:23:45 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Omaha #4839 Update for Jetty9 compatibility. Remove jetty jars from tests. 2015-11-19 15:56:02 -05:00
.gitignore Omaha #3685 Add support for sending specific products in mixed case 2014-10-22 14:29:30 -05:00