xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
1565 commits 31 branches 40 tags 3.8 GiB
Commit graph

9 commits

Author SHA1 Message Date
Bryan Kowal
8d64fdba2c Issue #777 - Merge branch thunder:8-64Bit (OB12.6.1-10) into AWIPS2_baseline:merge_development 
Former-commit-id: c629f18f24 [formerly 99d22f395a] [formerly f92eb59a73 [formerly cb9c284220bb65f5e2f212a27a03def7aed29480]]
Former-commit-id: f92eb59a73
Former-commit-id: 580172b47c
 2012-07-10 16:57:16 -05:00
Steve Harris
53d2822329 Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncpafm/src/gov/noaa/nws/ncep/common/dataplugin/ncpafm/NcPafmRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.ncuair/src/gov/noaa/nws/ncep/common/dataplugin/ncuair/NcUairRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

All of these were 'self-resolved' when kdiff3 invoked


Former-commit-id: d7f7c26582 [formerly 092efd6072] [formerly 31b3e87ffa [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 31b3e87ffa
Former-commit-id: 98447412f8
 2012-05-09 13:19:47 -05:00
Steve Harris
33a67cdd82 12.4.1-10 baseline 
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 8485b90ff8
Former-commit-id: a28d70b5c5
 2012-05-01 18:06:13 -05:00
Steve Harris
73a337bc31 Merge branch 'ss_sync' into 9-Wes2Bridge 
Conflicts:
	.gitignore
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5scd/src/gov/noaa/nws/ncep/common/dataplugin/h5scd/H5ScdRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.h5uair/src/gov/noaa/nws/ncep/common/dataplugin/h5uair/H5UairRecord.java
	ncep/gov.noaa.nws.ncep.common.dataplugin.mcidas/src/gov/noaa/nws/ncep/common/dataplugin/mcidas/McidasRecord.java
	ncep/gov.noaa.nws.ncep.edex.plugin.mosaic/src/gov/noaa/nws/ncep/edex/plugin/mosaic/common/MosaicRecord.java

deleted h5 files
using ss_sync version of java files


Former-commit-id: 24059a5b4e [formerly 9b67525e95] [formerly e5b56c99ab [formerly fb9d0adece5806382d0aa5c7c3e7c41f89594143]]
Former-commit-id: e5b56c99ab
Former-commit-id: 40d7357165
 2012-02-27 15:58:49 -06:00
Steve Harris
b55a488ed8 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 8da36046de [formerly c8aae98741] [formerly 54be9660f1 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]
Former-commit-id: 54be9660f1
Former-commit-id: 4450cf8963
 2012-02-22 11:14:43 -06:00
Bryan Kowal
886b054204 Issue #18 - merging wes2bridge rpm changes into the git wes2bridge branch. 
Former-commit-id: a37509adf3 [formerly c08293a1dc] [formerly bda5954b3c [formerly 9df496bfe5fea08e8c2c11e5fadcc0d09bad125d]]
Former-commit-id: bda5954b3c
Former-commit-id: 6a07f850bd
 2012-01-23 14:39:39 -06:00
Bryan Kowal
9f6780c4dd Issue #202 - restoring rpm directory to ss_sync. 
Former-commit-id: 4453ad2d10 [formerly 65e1e4ee0b] [formerly ea1c82452b [formerly 56068aa96fa6daf113861476bf4b7aebe2021ca4]]
Former-commit-id: ea1c82452b
Former-commit-id: 7f1b468010
 2012-01-20 13:38:00 -06:00
Matt Nash
82300ccdcf Moving 12.1.1 into ss_sync 
Former-commit-id: 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]
Former-commit-id: c83e5ff474
Former-commit-id: 1faae42484
 2012-01-19 11:53:12 -06:00
root
8e80217e59 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 3360eb6c5f
 2012-01-06 08:55:05 -06:00