2 commits

Author	SHA1	Message	Date
Richard Peter	42c78326f1	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: 1f32ef9c7a [formerly 5e5047cc4f] [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]] Former-commit-id: 2a9276c728 Former-commit-id: c0b0eef331 [formerly db7c941f6f] Former-commit-id: 9cf5e247ab	2013-08-14 15:23:18 -05:00
Max Schenkelberg	5167a52b65	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 ... Change-Id: I2a26ce21ca5127ddb0b32e1f645a544e83f5503f Former-commit-id: b95a96f4c9 [formerly 0f3c791120] [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]] Former-commit-id: d79cfe8ad1 Former-commit-id: 4fdb3c8306 [formerly 75c95e83ef] Former-commit-id: 2178fac70d	2013-08-09 14:24:49 -05:00