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

6 commits

Author SHA1 Message Date
Steve Harris
fc70139990 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: 31b3e87ffa [formerly 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]]
Former-commit-id: 092efd6072
Former-commit-id: d7f7c26582
 2012-05-09 13:19:47 -05:00
Richard Peter
231d98b79e Issue #538: Fix Serialization Annotations and Serialization Issues 
Change-Id: I436997106438ab283e987cb7e3055fcee009b608

Former-commit-id: b11df888d3 [formerly 349adaeedd [formerly 3aadbc778d9bb22dc9c0b4b93bbbaa70c3fa07d0]]
Former-commit-id: 349adaeedd
Former-commit-id: c33a392a8c
 2012-04-27 12:08:29 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline 
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
 2012-04-18 15:18:16 -05:00
Ben Steffensmeier
5957b76dd1 Issue #176 pull changes to insert and persist time from the WES2Bridge branch. 
Change-Id: If82378f4d8ccf867a5078682893ce65591ea04b4

Former-commit-id: 73f6e9e322 [formerly f016be988e [formerly 500f3f03f5260cff3417021776204ccf6c035415]]
Former-commit-id: f016be988e
Former-commit-id: 4179defc4f
 2012-02-03 17:33:32 -06:00
David Gillingham
91ecb60c1f Issue #20: Merge all changes from previous SVN repo to GIT. 
Former-commit-id: b056e18757 [formerly 845e6c19af [formerly 926a2a6a5af5b3514c29097deb0fc24b093643a2]]
Former-commit-id: 845e6c19af
Former-commit-id: b31f40ec9d
 2012-01-26 17:38:43 -06:00
root
133dc97f67 Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]
Former-commit-id: 9f19e3f712
Former-commit-id: a02aeb236c
 2012-01-06 08:55:05 -06:00