Mirror of Unidata's AWIPS2.
Find a file
Richard Peter a7075027be Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
	edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java

Former-commit-id: 2608dfe1d8 [formerly c61afa1bfa] [formerly 2608dfe1d8 [formerly c61afa1bfa] [formerly ee6b9eb11a [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]]]
Former-commit-id: ee6b9eb11a
Former-commit-id: 3f65eaf74b [formerly 58a4aaa080]
Former-commit-id: 7ca1edf371
2013-08-14 14:29:55 -05:00
cave Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1 2013-08-14 14:29:55 -05:00
cots Issue #2117 Revert changes to configurable hibernate dialect, fix ebxml thrift service camel route 2013-06-18 12:34:25 -05:00
cotsSource/org.apache.qpid 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
deltaScripts Issue #2038 Split db/localization files delta scripts 2013-06-11 17:48:18 -05:00
edexOsgi Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1 2013-08-14 14:29:55 -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 13.4.1-1 baseline 2013-04-24 17:15:55 -05:00
MHSEmulator 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
msi 13.5.1-1 baseline 2013-06-10 15:17:17 -04:00
nativeLib 13.5.1-15 baseline 2013-08-14 10:24:26 -04:00
ncep 13.5.1-13 baseline 2013-08-08 17:00:36 -04:00
ost Issue #1989 make camel stacktraces not get bunched up on a single line, consolidate log component settings to edex.xml 2013-06-19 10:16:06 -05:00
pythonPackages 13.5.1-7 baseline 2013-07-18 12:07:22 -04:00
RadarServer 13.5.1-8 baseline 2013-07-26 09:02:34 -04:00
rpms 13.5.1-13 baseline 2013-08-08 17:00:36 -04:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests 13.5.1-6 baseline 2013-07-10 10:04:22 -04: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