xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cots
History
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
..
com.facebook.thrift 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.mchange 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.opensymphony.ognl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.jna 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.sun.jndi.nis 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.oswego 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.activation 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.jms 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.mail 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.measure 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl.linux32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl.linux64 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.media.opengl.win32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.persistence 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
javax.vecmath 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncsa.hdf5 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncsa.hdf5.linux32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ncsa.hdf5.win32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.sf.cglib 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.sf.ehcache 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
net.sf.swtaddons 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.activemq 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.batik 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.camel 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.beanutils 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.cli 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.codec 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.collections 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.configuration 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.digester 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.lang 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.logging 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.management 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.pool 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.commons.validator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.http 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.log4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.mina 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.qpid 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.tomcat.nativ 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.tools.bzip2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.velocity 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.dom4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.eclipse.jetty 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.geotools 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.hibernate 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jboss.cache Merge branch 'ss_sync' (OB12.4.1-10) into 9-Wes2Bridge 2012-05-09 13:19:47 -05:00
org.jep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jep.linux32 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
org.jep.linux64 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
org.jep.win32 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jivesoftware.smack 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.junit 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.objectweb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.postgres 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.slf4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework.dm 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
ucar.nc2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
uk.ltd.getahead 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00