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

4 commits

Author SHA1 Message Date
Steve Harris
98447412f8 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: 092efd6072 [formerly f98354aae305ad227eaf3b36e4393b8aefc80f02]
Former-commit-id: 31b3e87ffa
 2012-05-09 13:19:47 -05:00
David Gillingham
36717c7a3e Issue #473: Properly archive text plugin records, 
fix bugs in DatabaseArchiver.determineStartTime().

Change-Id: I2a7a71bcf7bdbc5ea786d949631b45342675ce1f

Former-commit-id: 526abfd36e [formerly 6e45fc4f0eb15409a20be99c02b2ac43c8ed842e]
Former-commit-id: 04ab5d619b
 2012-04-25 17:08:21 -05:00
Steve Harris
a4e519f3cd 12.4.1-4 baseline 
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
 2012-04-18 15:18:16 -05:00
root
3360eb6c5f Initial revision of AWIPS2 11.9.0-7p5 
Former-commit-id: 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]
Former-commit-id: 06a8b51d6d
 2012-01-06 08:55:05 -06:00