Steve Harris
|
3f8cc1daf3
|
Merge branch 'omaha_13.5.1' (13.5.1-16) into development
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
nativeLib/edex_com/.cproject
Former-commit-id: 891f00d650 [formerly e8580e78f408b796a1fea65167c43cc122a325bf]
Former-commit-id: 8484f03bb8
|
2013-08-15 12:50:08 -05:00 |
|
Steve Harris
|
08b105a492
|
Merge branch 'master_13.5.1' into omaha_13.5.1
Former-commit-id: a687da6075 [formerly 85cde5da231741012e611250a5c3490467aeef1b]
Former-commit-id: 727eba03b9
|
2013-08-15 12:46:48 -05:00 |
|
Steve Harris
|
6818d80085
|
13.5.1-16 baseline
Former-commit-id: 7ce0234d76 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]
Former-commit-id: cd3b63d961
|
2013-08-15 13:40:37 -04:00 |
|
Jonathan Sanchez
|
78b655fd1f
|
Issue #2243 Resolved timing issues.
Change-Id: Ia0386bf21087cb2a00175e35ecfeae5206797a34
Former-commit-id: bc30396b63 [formerly 5833ecad04c31502b4e2991853e6aabeda4919f2]
Former-commit-id: 2b849d7003
|
2013-08-15 10:56:37 -05:00 |
|
Richard Peter
|
8ba6abf642
|
Issue #1977: Fix merge issue with WarngenDialog
Former-commit-id: a5383dbfa4 [formerly ddfc06eb9753e893ece28e1718c5e4550e82b053]
Former-commit-id: 7c03fc955b
|
2013-08-14 15:33:02 -05:00 |
|
Richard Peter
|
1f32ef9c7a
|
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: 2a9276c728 [formerly e1aa1aa51e2325b005604aa971e842bccfcd8375]
Former-commit-id: 5e5047cc4f
|
2013-08-14 15:23:18 -05:00 |
|
Richard Peter
|
2608dfe1d8
|
Merge branch 'master_13.5.1' (13.5.1-15) into omaha_13.5.1
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/FollowupData.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/FollowUpUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPBasinData.java
Former-commit-id: ee6b9eb11a [formerly 87a1f8f44cbdfb9006eb5e222ae2c220c6a324b3]
Former-commit-id: c61afa1bfa
|
2013-08-14 14:29:55 -05:00 |
|
Steve Harris
|
535218c676
|
13.5.1-15 baseline
Former-commit-id: c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]
Former-commit-id: 53e96e21db
|
2013-08-14 10:24:26 -04:00 |
|
Jonathan Sanchez
|
52d7862d36
|
Issue #2243 Resolved incorrect import.
Change-Id: I02e446858d36a934b9aa308a0bc2d4df3863defb
Former-commit-id: fd0f2f1c09 [formerly f79e7820ea010e0bc860b0033183147d7299221f]
Former-commit-id: c6b6576f01
|
2013-08-13 20:47:49 -05:00 |
|
Jonathan Sanchez
|
8d0ee7f5ca
|
Issue #2243 Fixed update list bugs.
Change-Id: Ie04d66593c450592c78fccdb8d6b78d889d4b68f
Former-commit-id: 49f488a58f [formerly 4dcfd87f1ae127b8050a4c168a5acf0dd6c815ee]
Former-commit-id: d685125b25
|
2013-08-13 16:30:05 -05:00 |
|
Lee Venable
|
ef5a7fb83a
|
Merge "Issue #2243 Prevented invalid follow ups." into omaha_13.5.1
Former-commit-id: 69645f03dc [formerly db71f51d18af219c2fdee6dcbe077be50d4e9e54]
Former-commit-id: 69dd7b66fa
|
2013-08-08 16:40:59 -05:00 |
|
Jonathan Sanchez
|
05f49219d3
|
Issue #2243 Prevented invalid follow ups.
Change-Id: I45f756cd5d7d41cd0086cc76b5473d37ed5b0c1e
Former-commit-id: dad0681ae0 [formerly a09e3b7957bdfeebb4283fad2ce5cce5d26b8a26]
Former-commit-id: 4711226b21
|
2013-08-08 16:31:35 -05:00 |
|
Greg Armendariz
|
f0b62a22bf
|
13.5.1-13 baseline
Former-commit-id: 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]
Former-commit-id: 29b823fee4
|
2013-08-08 17:00:36 -04:00 |
|
Steve Harris
|
778df21de9
|
13.5.1-9 baseline
Former-commit-id: 6e60cd9a79 [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]
Former-commit-id: 97fe6a670f
|
2013-08-01 09:20:23 -04:00 |
|
Jonathan Sanchez
|
c62de0d75f
|
Issue #2176 Implemented emergency warning products.
Change-Id: Icde169adbcfc5c409319649d63d222044a35dae2
Former-commit-id: 67ce90c14a [formerly 36df6339cc00afc5935746a4a47b0e9e8c641f85]
Former-commit-id: 7d74ba5ee1
|
2013-07-25 13:47:44 -05:00 |
|
Steve Harris
|
630705aa3f
|
13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: bf58a81b38
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
82aabf1066
|
13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]
Former-commit-id: 492f92ef7b
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
bc60b22f00
|
13.5.1-2 baseline
Former-commit-id: 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]
Former-commit-id: adb779323d
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
6384018950
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
be236eb722
|
13.4.1-14 baseline
Former-commit-id: 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]
Former-commit-id: c749e122eb
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
397bbf674a
|
13.4.1-12 baseline
Former-commit-id: e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]
Former-commit-id: 6a97b4325a
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
d6319a2ca6
|
13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]
Former-commit-id: 2edee36158
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
88eee9cbfa
|
13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]
Former-commit-id: bcf7f15c90
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
8072752c77
|
13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 4c6ff79e71
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
6fcbb5ae6b
|
13.4.1-6 baseline
Former-commit-id: 16fe8cc5a2 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]
Former-commit-id: 8379977673
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
aa9a719836
|
13.4.1-5 baseline
Former-commit-id: 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]
Former-commit-id: 85bbf6d242
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
3486902772
|
13.4.1-3 baseline
Former-commit-id: 86e96f378c [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]
Former-commit-id: 54afedf617
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
9212be8b74
|
13.4.1-2 baseline
Former-commit-id: 5ebd58a0b3 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]
Former-commit-id: 52f0ae4758
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
f95e0ad10b
|
13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 2f517b7713
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
07f7e6e2b4
|
13.3.1-20 baseline
Former-commit-id: 446bec6f49 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]
Former-commit-id: 25432cc388
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
dc9fef33a9
|
13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]
Former-commit-id: 9be238bcc4
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
f28b85d42f
|
13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]
Former-commit-id: 7bf9966dcb
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
a262f22cee
|
13.3.1-16 baseline
Former-commit-id: 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]
Former-commit-id: 51380726d4
|
2013-04-01 11:39:08 -05:00 |
|
Steve Harris
|
91a5e4578e
|
13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]
Former-commit-id: 9022c500ce
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
be96282207
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
c7b2ef2d8c
|
13.3.1-9 baseline
Former-commit-id: f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]
Former-commit-id: 468ae82305
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
d79303de13
|
13.3.1-4 baseline
Former-commit-id: 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]
Former-commit-id: 8c0b90f292
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
a55f438dd8
|
13.3.1-3 baseline
Former-commit-id: 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]
Former-commit-id: 6572452887
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
3e60b23072
|
13.3.1-2 baseline
Former-commit-id: 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]
Former-commit-id: df6d6f598e
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
96768407a5
|
13.3.1-1 baseline
Former-commit-id: cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]
Former-commit-id: 0563d7ac18
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
370b2558f0
|
13.2.1-7 baseline
Former-commit-id: c86246ab4d [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]
Former-commit-id: 1ce95d1df2
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
cc48fa4fc6
|
13.2.1-6 baseline
Former-commit-id: 53adfb7345 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]
Former-commit-id: b80782b081
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
1a74d2f0c5
|
13.2.1-5 baseline
Former-commit-id: f99f99e2f5 [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]
Former-commit-id: b4014794de
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
f2b28cfa56
|
13.2.1-4 baseline
Former-commit-id: 1e77a6f0bd [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]
Former-commit-id: 1beb655fa0
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
48d1aa7732
|
13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
efd3392abe
|
13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
51208e5515
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
2d338b4cec
|
12.12.1-8 baseline
Former-commit-id: 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]
Former-commit-id: 19962f41ba
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
a81c46987b
|
12.12.1-3 baseline
Former-commit-id: b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: c999505fba
|
2012-11-13 17:27:04 -06:00 |
|