Steve Harris 69626ab704 Merge branch 'omaha_14.2.1' into development ... Conflicts: cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/GeneralGridData.java cave/com.raytheon.viz.product.awips/awips.product edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsUtils.java edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataPluginDao.java Former-commit-id: a465718a0d [formerly 24ab7cff49] [formerly a465718a0d [formerly 24ab7cff49] [formerly 69dc3d835b [formerly 2d255c9772a017e84b0d1b4b42cdc5de8fd53b90]]] Former-commit-id: 69dc3d835b Former-commit-id: b62efa9387 [formerly 252c7ee40a] Former-commit-id: 2a967fc9b5		2014-01-21 12:36:54 -06:00
..
cache	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
db/hibernateConfig	Issue #2125: Clean up hibernate warnings	2014-01-17 14:12:34 -06:00
res	13.5.1-1 baseline	2013-06-10 15:17:17 -04:00
spring	Issue #2608 quartz components use single scheduler	2014-01-14 08:43:21 -06:00
banner.txt	12.9.1-5 baseline	2012-08-21 15:27:03 -05:00
logback-dataprovideragent.xml	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
logback-ingest.xml	Merge branch 'omaha_13.5.3' (13.5.3-5) into development	2013-11-07 14:25:45 -06:00
logback-registry.xml	Issue #2494 Updated to use thread logger	2013-11-06 08:26:25 -06:00
logback.xml	Issue #2142 disable stacktraces on hibernate log to save disk space	2013-08-29 12:23:39 -05:00
logging.properties	Issue #2142 initial cutover from log4j to SLF4J and logback	2013-07-01 14:41:05 -05:00
modes.xml	Merge branch 'master_14.1.1' into solutions	2014-01-13 17:45:20 -06:00
wrapper.conf	Issue #2717 Force use of legacy merge sort	2014-01-20 17:22:26 -06:00