xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cave
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
..
build 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.uf.viz.acarssounding 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.alertviz 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.alertviz.localization 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.alertviz.localization.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.alertviz.ui 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.app.launcher 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.application 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.aviation.advisory 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.bufrsigwx 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.bufrua 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ccfp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.climo 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.cloudheight 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.common.core.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.coopprecip Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.core Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.core.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.core.maps Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.uf.viz.core.maps.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.core.rsc 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.cots.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.cwa 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.cwat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.core 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.uf.viz.d2d.core.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.gfe 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.gfe.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.nsharp 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.uf.viz.d2d.nsharp.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.skewt.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.ui 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.xy.adapters 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.d2d.xy.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.dat.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.dataplugin.obs.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.dataplugins.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.datastorage.remote Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.derivparam Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.derivparam.python 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.derivparam.ui 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.displays.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.eclipse.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.feature.alertviz 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ffg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.localization.perspective 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.localization.perspective.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.monitor Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.monitor.ffmp Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.monitor.fog 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.monitor.safeseas 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.monitor.scan Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.monitor.snow 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncep.dataplugins.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncep.displays.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ncwf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.npp.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.npp.viirs Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.uf.viz.nwsauth.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.objectiveanalysis 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.plugin.nwsauth 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.preciprate 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.product.alertviz 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.productbrowser 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.profiler 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.pypies 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.python.swt 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.qpf 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.radar.gl Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.uf.viz.radarapps.config 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.radarapps.core 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.radarapps.fsi 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.radarapps.requests 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.radarapps.rps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.sounding 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.sounding.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.spellchecker 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.spring.dm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.tcs 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.thinclient 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.thinclient.alertviz 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.thinclient.cave Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.thinclient.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.ui.menus Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.uf.viz.vaa 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.vil 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.xy Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.uf.viz.xy.crosssection 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.xy.timeheight 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.xy.timeseries 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.uf.viz.xy.varheight Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.viz.alerts Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.aviation Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.avnconfig 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.avnfps.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.awipstools 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.bcd 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.core Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.viz.core.contours Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.viz.core.gl Issue #358 Fixed merge errors when merging core_exp into ss_sync 2012-05-01 18:36:09 -05:00
com.raytheon.viz.core.graphing Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.viz.drawing 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.feature.awips 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.feature.awips.developer 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.geotiff 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.gfe 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.gfe.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.ghg 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.grib.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.grid Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.hydro 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.hydro.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.hydrobase 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.hydrocommon 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.lightning 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.localization 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.lpi 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.mpe 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.mpe.ui 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.pointdata Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.product.awips 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.radar Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.radar.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.redbook 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.satellite Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.satellite.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.shapefile 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.skewT 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.spi 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.text.feature Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.texteditor Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
com.raytheon.viz.textworkstation 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.ui Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration) 2012-05-01 18:31:09 -05:00
com.raytheon.viz.ui.personalities.awips 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.ui.tools.looping 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.ui.tools.map 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.ui.tools.nav 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.volumebrowser 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.volumebrowser.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.warngen 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.warngen.feature 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.raytheon.viz.warnings 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
com.raytheon.viz.xdat 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.hseb.common 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.hseb.fcstservice 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.hseb.ihfsdb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.hseb.monitor 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ohd.hseb.sshp 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00