Richard Peter
|
490a96fe1d
|
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: be6e9a56c2 [formerly 181df35afc] [formerly 1f32ef9c7a] [formerly 1f32ef9c7a [formerly 5e5047cc4f]] [formerly be6e9a56c2 [formerly 181df35afc] [formerly 1f32ef9c7a] [formerly 1f32ef9c7a [formerly 5e5047cc4f]] [formerly 2a9276c728 [formerly 1f32ef9c7a [formerly 5e5047cc4f] [formerly 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]]]]]
Former-commit-id: 2a9276c728
Former-commit-id: 952cd0ba74 [formerly 84bef1f2ec] [formerly c0b0eef331] [formerly f4a9d1b418785d46989c39e20a932c12931ea5c2 [formerly 9c1694fcc8344cffbdb2feb402c25389a357d414] [formerly c0b0eef331 [formerly db7c941f6f]]]
Former-commit-id: 598d61cea0ae533b59edefd72edeb04ee2e5c1dc [formerly 45b98e41300d826058702743e6eeb0852aa1ad89] [formerly 42c78326f1 [formerly 9cf5e247ab]]
Former-commit-id: 42c78326f1
Former-commit-id: e6a36eb12a
|
2013-08-14 15:23:18 -05:00 |
|
Max Schenkelberg
|
7d23d045d6
|
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: 23520d6f7a [formerly cb1d5d1c5b] [formerly b95a96f4c9] [formerly b95a96f4c9 [formerly 0f3c791120]] [formerly 23520d6f7a [formerly cb1d5d1c5b] [formerly b95a96f4c9] [formerly b95a96f4c9 [formerly 0f3c791120]] [formerly d79cfe8ad1 [formerly b95a96f4c9 [formerly 0f3c791120] [formerly d79cfe8ad1 [formerly 5c707a35dcaedf5ae37119e56503aa8af59631fc]]]]]
Former-commit-id: d79cfe8ad1
Former-commit-id: f2ff85b4e5 [formerly cc6950107f] [formerly 4fdb3c8306] [formerly cc8e0cdf31112699e7c47aa937cde736cb0f0669 [formerly 0d46128ba8af16237227239c716ce61a2bd99042] [formerly 4fdb3c8306 [formerly 75c95e83ef]]]
Former-commit-id: fad90e489d422a21f39e385373035ceeba54e262 [formerly 6330e8d0028065ee6a7110c911ee4f47033f7729] [formerly 5167a52b65 [formerly 2178fac70d]]
Former-commit-id: 5167a52b65
Former-commit-id: 750f71ea98
|
2013-08-09 14:24:49 -05:00 |
|
Steve Harris
|
26b250dbd1
|
12.4.1-4 baseline
Former-commit-id: 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 779a297bc5 [formerly 4767b0e069] [formerly 750b7543dd] [formerly 750b7543dd [formerly 67a5a68300]] [formerly 2a216f333c [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 6456a7f75f [formerly 98d8b3f188] [formerly a2a6a18fae] [formerly 8177a31ae65520dcaf2978b703dc497369e03cf1 [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b] [formerly a2a6a18fae [formerly a4e519f3cd]]]
Former-commit-id: a5e6e414f62a4ad9f7e0da4037f64ad5885e2f16 [formerly 816045b74a6ddb3791f4e241a6f25a4d4ab3391a] [formerly 74b66d9683 [formerly 8cd5974f4c]]
Former-commit-id: 74b66d9683
Former-commit-id: 5b35d8a6e0
|
2012-04-18 15:18:16 -05:00 |
|
Matt Nash
|
1b128de135
|
Moving 12.1.1 into ss_sync
Former-commit-id: 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly 6bcbc7d8ef [formerly d8da2252c3] [formerly 580e2938d7] [formerly 580e2938d7 [formerly 66be3bec40]] [formerly c83e5ff474 [formerly 580e2938d7 [formerly 66be3bec40] [formerly c83e5ff474 [formerly 2a9569942c48542cf708b6c0b9189146fd954c11]]]]]
Former-commit-id: c83e5ff474
Former-commit-id: 50944163ba [formerly fa4cd88c90] [formerly 82300ccdcf] [formerly bcc32c10bc [formerly 21d2361f00] [formerly 82300ccdcf [formerly 1faae42484]]]
Former-commit-id: bcc32c10bc [formerly 21d2361f00]
Former-commit-id: bcc32c10bc
Former-commit-id: 515196cb86
|
2012-01-19 11:53:12 -06:00 |
|
root
|
57877615f5
|
Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 2b462d8665 [formerly 133dc97f67] [formerly a02aeb236c] [formerly a02aeb236c [formerly 9f19e3f712]] [formerly 06a8b51d6d [formerly a02aeb236c [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 2c3569dd39 [formerly 9bb8decbcf] [formerly 8e80217e59] [formerly e2ecdcfe33 [formerly 377dcd10b9] [formerly 8e80217e59 [formerly 3360eb6c5f]]]
Former-commit-id: e2ecdcfe33 [formerly 377dcd10b9]
Former-commit-id: e2ecdcfe33
Former-commit-id: 7dbd17a5aa
|
2012-01-06 08:55:05 -06:00 |
|