Mirror of Unidata's AWIPS2.
Find a file
Richard Peter 2a9276c728 Merge branch 'omaha_13.5.1' (13.5.1-15) into development
Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	edexOsgi/com.raytheon.edex.plugin.bufrua/res/pointdata/bufruadb.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
	edexOsgi/com.raytheon.edex.plugin.modelsounding/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/AbstractWarningRecord.java

Former-commit-id: e1aa1aa51e2325b005604aa971e842bccfcd8375
2013-08-14 15:23:18 -05:00
cave Merge branch 'omaha_13.5.1' (13.5.1-15) into development 2013-08-14 15:23:18 -05:00
cots Issue #2027 upgrade version of derby 2013-08-07 16:44:30 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2210 moved base cave_static colormaps to common_static and updated code 2013-08-06 17:17:53 -05:00
edexOsgi Merge branch 'omaha_13.5.1' (13.5.1-15) into development 2013-08-14 15:23:18 -05:00
javaUtilities 13.5.1-8 baseline 2013-07-26 09:02:34 -04:00
ldm 13.2.1-2 baseline 2013-01-23 11:18:44 -05:00
localApps 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
localization Issue #2186 add generic pdo distributor and move the gfe routes to the gfe file; remove config.xml from warngen localization as it breaks things 2013-07-11 13:32:26 -05:00
MHSEmulator Issue #2009: Fix NullPointerException in SocketServer start up. 2013-07-23 13:57:38 -05:00
msi Issue #2198 - created a launcher that would start both AlertViz and CAVE; no extra windows are created now 2013-08-08 17:45:58 -05:00
nativeLib Merge branch 'omaha_13.5.1' (13.5.1-15) into development 2013-08-14 15:23:18 -05:00
ncep Merge branch 'omaha_13.5.1' (13.5.1-15) into development 2013-08-14 15:23:18 -05:00
ost Issue #2142 Got log4j out of edex. 2013-07-15 14:26:15 -05:00
pythonPackages Issue #2215 upgrade thrift to version 0.9.0 2013-07-23 12:28:07 -05:00
RadarServer Merge branch 'omaha_13.5.1' (13.5.1-8) into development 2013-07-31 12:54:12 -05:00
rpms Merge branch 'omaha_13.5.1' (13.5.1-15) into development 2013-08-14 15:23:18 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #2224 Bug fixes to pass unit test. 2013-08-14 10:25:49 -05:00
tools 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00
.gitignore Fix the git ignore file 2012-09-14 12:04:24 -05:00