xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
Mirror of Unidata's AWIPS2.
247 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
Steve Harris 3e1eb0d8e0 Merge branch 'master_13.1.2' into master 
'theirs merge' - took all of master_13.1.2

Conflicts:
	cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
	cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
	edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
	edexOsgi/com.raytheon.uf.common.parameter/build.properties
	edexOsgi/com.raytheon.uf.common.spatial/build.properties
	edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
	ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml

Former-commit-id: 7a9ad0392e [formerly ec6f65d581] [formerly 20349e11b0] [formerly 7a9ad0392e [formerly ec6f65d581] [formerly 20349e11b0] [formerly 4ff8c8967a [formerly 20349e11b0 [formerly b656a1ed430a571fbda029479ff457bb4405efc0]]]]
Former-commit-id: 4ff8c8967a
Former-commit-id: b6f53af0bf [formerly 49649155f2] [formerly e9b03748c5b3a0ff74a2cebeae786a2a00a71ef0 [formerly 6282e0fd39]]
Former-commit-id: f6bc8ee4fd0fb2fddb68791254e59231c99eee64 [formerly 0eb737164e]
Former-commit-id: 60847b986c
2013-04-03 17:17:32 -04:00
cave Merge branch 'master_13.1.2' into master 2013-04-03 17:17:32 -04:00
cots 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
cotsSource/org.apache.qpid Moving 12.1.1 into ss_sync 2012-01-19 11:53:12 -06:00
deltaScripts 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
edexOsgi Merge branch 'master_13.1.2' into master 2013-04-03 17:17:32 -04:00
javaUtilities 13.1.2-6 baseline 2013-01-06 14:55:11 -06:00
ldm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
nativeLib 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
ncep Merge branch 'master_13.1.2' into master 2013-04-03 17:17:32 -04:00
ost 12.12.1-1 baseline 2012-11-07 12:41:20 -06:00
pythonPackages 13.1.2-12 baseline 2013-01-23 17:48:37 -05:00
RadarServer 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
rpms 13.1.1-10 baseline 2013-02-14 14:11:00 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -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