Mirror of Unidata's AWIPS2.
Find a file
Steve Harris 4eb1ef5b0f Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 4981170462 [formerly dcadf7baa4] [formerly 86e586befe [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]
Former-commit-id: 86e586befe
Former-commit-id: 938dc5b21c
2012-02-23 12:38:55 -06:00
cave Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration 2012-02-23 12:38:55 -06:00
cots Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -06:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
edexOsgi Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 2012-02-23 10:06:18 -06:00
ldm Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
localApps Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
localization Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
MHSEmulator Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
msi Merge commit 'awips2_OB12.1.1_Omaha' into 4-Thin_Client 2012-02-15 14:39:43 -06:00
nativeLib Issue #182 - the meteolib Activator will now return a properly formatted path to the meteolib dll when on a Windows workstation. The meteolib "cape function" will now acurrately report if it is out of memory. 2012-02-17 11:09:13 -06:00
ncep Merge "Issue #185 handle CommunicationExceptions from the LevelFactory in remerged ncep grib decoder." into 4-Thin_Client 2012-02-23 11:50:39 -06:00
pythonPackages Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
RadarServer Issue #202 - make deploy-install compatible with git; updated classpaths and component-deploy.xml. 2012-01-20 11:37:38 -06:00
rpms Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration 2012-02-23 12:38:55 -06:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tools Issue #228 change plots, grid icons, and radar icons 2012-02-01 12:45:56 -06:00
.gitignore Issue #192 gitignore changes 2012-02-03 15:03:21 -06:00