Mirror of Unidata's AWIPS2.
Find a file
brian.dyke 4d161aaf90 Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml

Former-commit-id: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 011d121e4b
Former-commit-id: 9626317825
2014-05-19 09:45:37 -04:00
cave Merge branch 'master_14.3.1-4' into asm_14.3.1 2014-05-19 09:45:37 -04:00
cots Issue #3108 - update bignsharp for Windows 64-bit compatibility. Upgrade JNA. 2014-05-08 17:30:22 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2060: Consolidate grid indexes. 2014-05-12 16:59:34 -05:00
edexOsgi Merge branch 'master_14.3.1-4' into asm_14.3.1 2014-05-19 09:45:37 -04:00
javaUtilities Issue #2648 Update hprof info to match grid changes in 14.3 2014-04-23 15:42:33 -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 Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2758 Fix MHSEmulator to pass small files 2014-02-13 15:53:15 -06:00
msi Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds 2014-03-31 12:37:37 -05:00
nativeLib Merge branch 'master_14.3.1-4' into asm_14.3.1 2014-05-19 09:45:37 -04:00
ncep Issue #2873 Revert the deletion of the ncep nsharp win32 project. 2014-05-12 16:59:16 -05:00
ost Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1 2014-04-28 16:27:40 -05:00
pythonPackages Merge branch 'master_14.2.2' into master_14.3.1 2014-04-25 11:06:11 -04:00
RadarServer Merge branch 'omaha_14.2.2' (14.2.2-3) into development 2014-04-11 16:23:09 -05:00
rpms Merge "Issue #3089 fixed init.d script for collaboration dataserver RPM" into omaha_14.3.1 2014-04-30 19:34:43 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #3026 - NullPointer fix, test classpath fix 2014-05-08 15:02:54 -05:00
tools Issue #2726: Edex graceful shutdown. 2014-04-14 13:10:11 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00