xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
awips2/cots
History
Steve Harris 2641d578e2 Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c
2013-02-21 15:41:39 -06:00
..
com.facebook.thrift 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.google.guava Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
com.mchange 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
com.opensymphony.ognl 12.11.1-1 baseline 2012-09-27 15:57:45 -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
com.sun.xml.bind 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
de.micromata.opengis.kml Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
edu.oswego 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
edu.uci.ics.crawler4j 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
it.geosolutions 13.3.1-1 baseline 2013-02-20 16:19:40 -06: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.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.media.opengl.linux64 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
javax.media.opengl.win32 12.9.1-5 baseline 2012-08-21 15:27:03 -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
net.dods Merge branch 'development' into omaha_13.3.1 2013-02-21 15:41:39 -06:00
net.opengis 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
net.sf.cglib 12.9.1-5 baseline 2012-08-21 15:27:03 -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
ogc.tools.gml 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.apache.activemq 13.1.2-2 baseline 2013-01-06 14:32:24 -06: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.cxf 13.3.1-1 baseline 2013-02-20 16:19:40 -06: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.5.1-15 baseline 2012-06-08 13:39:48 -05:00
org.apache.log4j 12.11.1-1 baseline 2012-09-27 15:57:45 -05:00
org.apache.mina 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.qpid 12.9.1-10 baseline 2012-08-30 14:28:27 -05:00
org.apache.tomcat.nativ Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
org.apache.tools.bzip2 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.apache.velocity 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.apache.ws.security 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.codehaus.jackson 13.3.1-1 baseline 2013-02-20 16:19:40 -06:00
org.dom4j 12.6.1-9 baseline 2012-07-10 07:53:49 -05:00
org.eclipse.jetty 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.geotools 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
org.hibernate 13.1.2-2 baseline 2013-01-06 14:32:24 -06:00
org.jep 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.jep.linux32 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
org.jep.linux64 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
org.jep.win32 12.11.1-4 baseline 2012-10-16 13:27:07 -05:00
org.jivesoftware.openfire Issue #1408: Merge 13.1.2-6 into development 2013-01-09 17:55:05 -06:00
org.junit 13.2.1-6 baseline 2013-02-07 16:00:39 -06:00
org.objectweb 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.postgres 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
org.slf4j 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
org.springframework Issue #1543 Clean up test files after changing to Spring transactions 2013-02-12 11:59:45 -06: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