xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
6216 commits 31 branches 40 tags 3.8 GiB
Java 75.8%
Python 18%
HTML 4.5%
Shell 1.3%
PLpgSQL 0.1%
Find a file
Richard Peter 0b0b58e89c Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
	edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
	edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py

Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61

Former-commit-id: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
2014-07-01 15:34:39 -05:00
cave Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 2014-07-01 15:34:39 -05:00
deltaScripts Merge branch 'omaha_14.3.1' (14.3.1-10,11) into omaha_14.4.1 2014-06-16 08:19:12 -05:00
edexOsgi Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 2014-07-01 15:34:39 -05:00
javaUtilities Omaha #3275 - moving developer tools to separate repository 2014-06-25 16:16:03 -05: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 Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP. 2014-05-09 09:34:49 -05:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Omaha #3299 - Remove project file and change build reference 2014-06-30 14:49:24 -05:00
ncep Omaha #3165 remove deprecated buildColorMap() 2014-06-30 13:22:57 -05:00
ohd VLab Issue #3454 OHD changes to help with building. Also added a missing .project file to allow the project to appear in Eclipse. 2014-06-05 13:37:02 -04:00
ost Omaha #3226 fixed lightning decrypt validation, added initialization vector 2014-06-19 10:32:05 -05:00
pythonPackages Omaha #3096 fix DataTime to match the Python version 2014-06-26 15:12:39 -05:00
RadarServer Omaha #3309 - Remove reference to slf4j-log4j library 2014-06-26 11:34:47 -05:00
rpms Omaha #3230 Add URMA. 2014-06-26 11:16:09 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1 2014-07-01 15:34:39 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00