Mirror of Unidata's AWIPS2.
Find a file
Richard Peter 744eb64856 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FFMPTable.java
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	rpms/build/i386/build.sh

Change-Id: Ibfe5a34eb60b655ffd8d5f0a7a794648f778eb24

Former-commit-id: 24e3c900db35375045d2ec581772d0f3a7bf541c
2013-06-24 18:36:15 -05:00
cave Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 2013-06-24 18:36:15 -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.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4) 2013-05-03 09:20:30 -05: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-3) into omaha_13.5.1 2013-06-24 18:36:15 -05:00
javaUtilities Issue #2021 - relocate all Java hydro projects from nativeLib to a sub-directory within javaUtilities 2013-06-03 11:05:21 -05: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 Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds 2013-05-16 11:01:40 -05:00
nativeLib Merge branch 'master_13.5.1' into omaha_13.5.1 2013-06-17 15:25:32 -05:00
ncep Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 2013-06-24 18:36:15 -05: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 Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 2013-06-24 18:36:15 -05:00
RadarServer Issue #1927 - add quartz as a RadarServer build dependency 2013-05-15 12:38:02 -05:00
rpms Merge branch 'master_13.5.1' (13.5.1-3) into omaha_13.5.1 2013-06-24 18:36:15 -05:00
testProcedures/testDocuments Initial revision of AWIPS2 11.9.0-7p5 2012-01-06 08:55:05 -06:00
tests Issue #1802 Fix event processing in regards to transaction commits/rollbacks 2013-06-20 13:53:04 -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