xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/ncep
History
Steve Harris 092efd6072 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: f98354aae305ad227eaf3b36e4393b8aefc80f02
2012-05-09 13:19:47 -05:00
..
com.raytheon.uf.viz.ncep.core.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncep.nsharp.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncep.perspective.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.wisc.ssec.mcidas 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.airmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.atcf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.aww 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.convsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.idft 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.intlsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.mcidas Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncairep Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncccfp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncgrib Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncpafm Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncpirep Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncscat Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncscd Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.nctaf Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ncuair Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.nonconvsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.dataplugin.sgwh Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.sgwhv Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.ssha Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.common.dataplugin.stormtrack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.tcm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.dataplugin.wcp 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.common.log 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.common.log4j.config 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.common 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.gempak.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.ingest.grib.util 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.ingest.util 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.airmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.atcf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.aww 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.convsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.idft 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.intlsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.mcidas 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.mosaic Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.edex.plugin.ncairep 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncccfp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncgrib 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncpafm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncpirep 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncscat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ncscd 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.nctaf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.nctext 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.ncuair 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.nonconvsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.edex.plugin.sgwh 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.sgwhv 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.ssha 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.stormtrack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.tcm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.plugin.wcp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.edex.purgeutil Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.edex.uengine 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.gempak.parameterConversionLibrary 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.gempak.parameters 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.metParameters 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.ui.nctextui 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp.linux32 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp.linux64 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.ui.nsharp.win32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.ui.pgen 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.cloudHeight 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.common 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.gempak 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.localization 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.overlays 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.resourceManager 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.resources 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.airmet 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.atcf 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.convsigmet 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.ffa 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.hrcn 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.idft 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.intlsig 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.lightning 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.mosaic Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
gov.noaa.nws.ncep.viz.rsc.ncgrid 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.ncradar Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
gov.noaa.nws.ncep.viz.rsc.ncscat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.nonconvsigmet 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.pgen 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.plotdata 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.satellite Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
gov.noaa.nws.ncep.viz.rsc.stormtrack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.svrl 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.warn 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wavesat 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wcn 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wcp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.wou 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.rsc.wstm 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.rsc.wtch 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
gov.noaa.nws.ncep.viz.tools 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.display 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.locator 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
gov.noaa.nws.ncep.viz.ui.perspectives Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
gov.noaa.nws.ncep.viz.ui.seek 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00