awips2/cave/com.raytheon.uf.viz.core
Richard Peter 5e5047cc4f 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
..
.settings
localization/colorfile Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base 2013-08-09 14:24:49 -05:00
META-INF Issue #2142 removing some viz dependencies on edex.common 2013-07-22 12:20:43 -05:00
res/spring Issue #2142 initial cutover from log4j to SLF4J and logback 2013-07-01 14:41:05 -05:00
schema
scriptTemplates
src/com/raytheon Merge branch 'omaha_13.5.1' (13.5.1-15) into development 2013-08-14 15:23:18 -05:00
.classpath
.project
build.properties Issue #2033 Moved some localization files from build.cave to plugins they are used in. Fixed CAVELocalizationAdapter to search all plugins when file not found in base etc folder for cave static base 2013-08-09 14:24:49 -05:00
com.raytheon.uf.viz.core.ecl 12.4.1-4 baseline 2012-04-18 15:18:16 -05:00
config.xml 12.4.1-10 baseline 2012-05-01 18:06:13 -05:00
logback-viz-core-developer.xml Issue #2142 initial cutover from log4j to SLF4J and logback 2013-07-01 14:41:05 -05:00
logback-viz-core.xml Issue #2142 fix logback config 2013-08-06 11:39:34 -05:00
plugin.xml 12.9.1-5 baseline 2012-08-21 15:27:03 -05:00