Commit graph

32 commits

Author SHA1 Message Date
AWIPS User
caf76e907f mute com.raytheon.uf.viz.useradmin.feature
Former-commit-id: 9091438857 [formerly 558091c12b] [formerly 977d24c5ba82e9c984b23e4a0a25b1a027c7b5f3 [formerly 06dfa3deab]]
Former-commit-id: d08ff6d18c7c2c75b09ce2d75800fb1b3333cc9e [formerly bcd7945c69]
Former-commit-id: 8958c4ff23
2015-08-13 15:50:11 -06:00
mjames-upc
39551084df collaboration feature muted. ncgrid -> ncdata in d2d
Former-commit-id: 9133814b78 [formerly 7576c972e2] [formerly add481a69e837a841a35d7184ceb975f3a0358fd [formerly 443d9e501a]]
Former-commit-id: 92b1adbc8c2f23dc9c788a3cb1885569b4e893b4 [formerly 67e090fc2b]
Former-commit-id: 725aefc347
2015-08-13 14:57:38 -06:00
mjames-upc
7fa35bde8c I broke something here and now I have to go back to before
Former-commit-id: 0d3bc75aa2 [formerly 2fc37da768] [formerly 43e08f4b7993bee9f23266cbbdc808c046ffe9c5 [formerly c2b9f1b91e]]
Former-commit-id: 2f944905696b7ee4c588d3839786d313625c0a8e [formerly 454459dfca]
Former-commit-id: 94aac7e48c
2015-07-14 13:58:00 -06:00
AWIPS User
a833df9d6f moved satellite.feature to uf.viz.base.feature
Former-commit-id: 01aca700b6 [formerly 09a4c40900] [formerly 1e867518d06fc1c6681979a1d4fdd84e1867445d [formerly 934723db60]]
Former-commit-id: 5ad358d982fdbe11afa866bd010c0b1d5ae7baa1 [formerly cd5d190f88]
Former-commit-id: b3fcaa0058
2015-07-13 13:32:27 -06:00
AWIPS User
1420f3b7ea SPS support added for satellite.mcidas decoder; various menu/SatResource edits to support dynamic area menu items.
Former-commit-id: 75bee340f2 [formerly 9abdc84540] [formerly 7574f65f15fe8b817ae358fc7448241484be1ace [formerly dcb05bac39]]
Former-commit-id: 13f1b1c3d0d48deabc92aa70bd1aff324ac34bdd [formerly a0edadacf6]
Former-commit-id: 31d1e4f345
2015-06-16 10:13:43 -06:00
AWIPS User
7101784a38 D2D menus
Former-commit-id: b992f650c3 [formerly 0e116e6e5a] [formerly 1c74b47a384ca893f233d0e5aa1c22ab4d23dd24 [formerly 2a6d837672]]
Former-commit-id: cbc7b955d1b9dd187b1b63139e38924d8eb92a49 [formerly 9ba75100cb]
Former-commit-id: 3337eead54
2015-04-22 17:05:35 -06:00
Ana Rivera
769df60be8 Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129, #5421, #5345.
Conflicts:
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
	cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895

Former-commit-id: 1f5dd0c92b [formerly 214be0a93b] [formerly 043bc3a8b7] [formerly 1f5dd0c92b [formerly 214be0a93b] [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 043bc3a8b7 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]]
Former-commit-id: 1823ed3596
Former-commit-id: 90efb445f0 [formerly ef35771bfa] [formerly df1f34b8c00ffdaeec21c1d4b59bdc4ae9648cb2 [formerly d2d8127363]]
Former-commit-id: d7532e0824a0a0330656fbdab24737f609c2a10f [formerly f7c0319ee4]
Former-commit-id: 40df82b005
2014-12-16 23:39:02 +00:00
Jordan Gerth
f35069c29d VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0

Former-commit-id: 39f9c87fa3 [formerly 4003c09e47] [formerly 784c43ee33] [formerly 39f9c87fa3 [formerly 4003c09e47] [formerly 784c43ee33] [formerly e0fd068337 [formerly 784c43ee33 [formerly fe7454aac732eae6bd0024be122b819e909f98fa]]]]
Former-commit-id: e0fd068337
Former-commit-id: 1023596fc1 [formerly e730a2d381] [formerly 2266d3ae1a75743687582a36712582f3fc14c01b [formerly 1ac7dcdc14]]
Former-commit-id: 5fe39ff7330bbff2a2d79e32115ffacab75d7459 [formerly 9896e639bb]
Former-commit-id: e925d559e2
2014-12-14 15:40:19 -06:00
Steve Harris
eeed771860 Merge branch 'omaha_14.4.1' into omaha_pda
Conflicts:
	cave/com.raytheon.viz.feature.awips.developer/feature.xml

Former-commit-id: 378db03f97 [formerly 716c1c8dae] [formerly 4535f432ce] [formerly 378db03f97 [formerly 716c1c8dae] [formerly 4535f432ce] [formerly dafec4c8fe [formerly 4535f432ce [formerly f2c656a4fe6d4b82f691e10d8dc49dcbbcff5adc]]]]
Former-commit-id: dafec4c8fe
Former-commit-id: fc36bb9df0 [formerly 46d475cc45] [formerly c18a3f184c31a1cd39603e8d4749a241d056a0f4 [formerly 0a6f1170fe]]
Former-commit-id: 535947695d9fa08de45fb144a87af03dfe031c9d [formerly d42d3aa991]
Former-commit-id: 27d75ed5cf
2014-10-16 13:40:43 -05:00
Brian Clements
0be119b360 Omaha #3672 moved aviation advisory plugins to separate feature
Change-Id: I7a71eceb14bba27648260e873aeef38982c6084f

Former-commit-id: 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 84217692bf [formerly 4a824111ec] [formerly 8a4cda892f] [formerly 577b3a5e11 [formerly 8a4cda892f [formerly 771e06df242b0fe7b4eec1e7c3099dfd316182ce]]]]
Former-commit-id: 577b3a5e11
Former-commit-id: fbffc63d5a [formerly 6ad5c3088d] [formerly 4cc2a0452da8ecf06e249d8ed7253d57b4357a97 [formerly 2de14cf885]]
Former-commit-id: 4ab31ef1abb0d696f1850c3f5c7dd3a3e55add19 [formerly 8ec3f473d7]
Former-commit-id: 3624ea94dc
2014-10-08 16:47:10 -05:00
Dave Hladky
4a89433f4e Omaha #3403 Changed BoundingBoxUtil to accomodate CSW updates for PDA
Change-Id: Ia26235017d4f6c860a49e40eae210a94e9385c97

Former-commit-id: f0ac16b4f9 [formerly ba60e36674] [formerly 76d6ce277e] [formerly f0ac16b4f9 [formerly ba60e36674] [formerly 76d6ce277e] [formerly 8ea42556f4 [formerly 76d6ce277e [formerly b0b596cb03ff44ccbd9a3d0347721bb2fac9c7e6]]]]
Former-commit-id: 8ea42556f4
Former-commit-id: 5d18e09b30 [formerly a96dece006] [formerly 67ba72464ffec48f0e170647f926a0788870951a [formerly a093a1ae86]]
Former-commit-id: dd2ad67ae83bf9089dca2c867591b8e24fdb0c5b [formerly 14ab75afc7]
Former-commit-id: eb221edaf0
2014-08-20 14:35:32 -05:00
Nate Jensen
a3949b4437 Omaha #3165 separate registry plugins for viz to support hazard services
Change-Id: I1c4d4b5861103c916c4b81f747dede562be818c4

Former-commit-id: d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly d873599954 [formerly a16d8689e9] [formerly f10efa300c] [formerly f32bf19eb7 [formerly f10efa300c [formerly 4fedf54b9e2102268c873550da9c567edc2dd255]]]]
Former-commit-id: f32bf19eb7
Former-commit-id: bdb4d8e102 [formerly ec64800f28] [formerly 698bed9b285b34465367799322f3d30195e6be16 [formerly 55dcecc7a7]]
Former-commit-id: 0b197806e0b2ceee741054932d4a8acc506b8f4d [formerly e659a0702d]
Former-commit-id: 8c99b38625
2014-07-01 17:37:08 -05:00
Richard Peter
bd6423f675 Omaha #3223 - Remove DD dependencies from AWIPS2_baseline
Change-Id: I51c65fefa56894104c970e9c07efab9ae7dbe289

Former-commit-id: 8cbf5f4762 [formerly 3beef299b1] [formerly 558699a370] [formerly 8cbf5f4762 [formerly 3beef299b1] [formerly 558699a370] [formerly e2288769d3 [formerly 558699a370 [formerly b48d9bd6affc340ef4791c99cbc95f122c4a69f8]]]]
Former-commit-id: e2288769d3
Former-commit-id: 23139f8b26 [formerly 121f0e00a4] [formerly 09f159abf4832d87decaa358207e37a58cf4a25a [formerly 220f7aa97a]]
Former-commit-id: 572b1480c60b64aa0cd08b4a426d8f2efe5a6538 [formerly 8ba13f812e]
Former-commit-id: aaab5e310f
2014-05-29 15:50:59 -05:00
Max Schenkelberg
5a32d83d62 Issue #2620 Reordered developer feature.xml to match p2-build.xml
Change-Id: I15a073d17b1e6df21c9c34245b373bc091cc5e67

Former-commit-id: a3495d01dc [formerly 13172879fd] [formerly ae7eb39380] [formerly a3495d01dc [formerly 13172879fd] [formerly ae7eb39380] [formerly 73c022da20 [formerly ae7eb39380 [formerly ea87ef4868b35b4fa89d519478ade9fb9468cca8]]]]
Former-commit-id: 73c022da20
Former-commit-id: 6fa1f6cc12 [formerly 59586b673b] [formerly 5235d6c097888869951204c434aba9265b112a4a [formerly 8abc1ec611]]
Former-commit-id: 5724d8b4dac3d86c43f19041a75769997c3ccfee [formerly 20ba02a238]
Former-commit-id: 38d14b6ad6
2014-01-10 10:39:07 -06:00
Max Schenkelberg
d6ee7afe4a Issue #2620 Fixed viz base feature dependency issues.
Change-Id: Ia3db09b101f800d77d0d95932a7abb69fc110aec

Former-commit-id: 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 0084b5b4f1 [formerly be45102814] [formerly 9d846aa104] [formerly 987d4b3a30 [formerly 9d846aa104 [formerly 520e22dd848cf6472232d60789e1f6938db7c776]]]]
Former-commit-id: 987d4b3a30
Former-commit-id: 774859fcb9 [formerly e86e477165] [formerly f76ae5c39c57683f77097753d76cab458fd9e037 [formerly eede01921e]]
Former-commit-id: db317e89829b4a77b51a6217c6048e6ba7e2f098 [formerly 5c2da4c3e3]
Former-commit-id: ede6c2fa1e
2013-12-09 15:14:01 -06:00
Ben Steffensmeier
3c7c80ec52 Issue #2269 add new acarssounding feature to resolve dependency issues.
Former-commit-id: 98b53fc247 [formerly a271dd3416] [formerly b51bd9bf9e] [formerly 98b53fc247 [formerly a271dd3416] [formerly b51bd9bf9e] [formerly b2989eb937 [formerly b51bd9bf9e [formerly eb6b98e80f483f330022481889522dcfd7f0e526]]]]
Former-commit-id: b2989eb937
Former-commit-id: 72f62123a6 [formerly b0b16f1e93] [formerly b95881bbde93eecc2c05d9174a1bec63e36307ea [formerly a9bb310daf]]
Former-commit-id: 37a5681a60370d93361ace3a171c38f14073ac39 [formerly 0ba01e4d93]
Former-commit-id: c4623516dd
2013-08-20 14:41:57 -05:00
Max Schenkelberg
b57cf3de95 Issue #2033 moved bundles and menu files into corresponding plugins
Change-Id: Idb92afac5ffb83f115ca77c3917fc7ef61f38afc

Former-commit-id: 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 9be1171c33 [formerly 6c92aa9dd7] [formerly 5ab8b6e2c6] [formerly 06dbae8bdb [formerly 5ab8b6e2c6 [formerly fe1b35711ec55a022027bb8ff1a27924b3926911]]]]
Former-commit-id: 06dbae8bdb
Former-commit-id: 41cc45e8fc [formerly 2fc5af010d] [formerly 116cd76f43f817c4146cfbf39bb00d7365fdbc12 [formerly 759ff7bcfd]]
Former-commit-id: 1ff68c0f5f81b9c5c23485ff991688d04f372125 [formerly 961ed891c8]
Former-commit-id: 229e0ee235
2013-08-14 09:20:28 -05:00
Roger Ferrel
1282bbbe35 Issue #1966 Feature place holders for the dialogs.
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly 7c7f9c01a6 [formerly d7e7a56b84] [formerly e55f73b4f7] [formerly d35424df4f [formerly e55f73b4f7 [formerly 04684460d021089818509726b1dd23d53fb90440]]]]
Former-commit-id: d35424df4f
Former-commit-id: 3aa439216d [formerly 760b0f3366] [formerly 71942aa83d41336218c476f9a4456699fc337e09 [formerly 2d4434119d]]
Former-commit-id: 4b447312fbfd772bb147bae920d49ac18c6c401c [formerly 6d3604e629]
Former-commit-id: 3ac1658261
2013-05-23 07:36:15 -05:00
Max Schenkelberg
10ee43ad97 Issue #1638 Added viz base feature as well as personalities cave project extracting out non-awips specific things in personalities awips project
Amend: Removed eclipse feature all together, added os and arch to fragments.  Ensured unpack flag stayed same when changing features.

Change-Id: I78a2c5262ebdbe3ace3c180254b5f036011c0a65

Former-commit-id: 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 16cce70f9d [formerly 6ccef4d3c7] [formerly bd52681be3] [formerly 7513e5982b [formerly bd52681be3 [formerly dd4ddb8aacf82f7c69860b470c3f754a59f0c124]]]]
Former-commit-id: 7513e5982b
Former-commit-id: d0edd6a882 [formerly 1950aff01a] [formerly 0dd1d5c1eb848344c287d03fc5cb6b4556d376ab [formerly 57f34e9080]]
Former-commit-id: d0f63d287352e6fa8f52b87780f423ef41d87efa [formerly 2e5c1a7c32]
Former-commit-id: eb6a0d25d0
2013-04-17 11:42:46 -05:00
Max Schenkelberg
805eacaa9a Issue #1638 Create base edex and common features that can be deployed to startup a base edex instance
Change-Id: I3f336969a48764785ac148c9d67799e228e66d62

Former-commit-id: 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 0fb8bb14d2 [formerly 1769edc026] [formerly ec40d261e5] [formerly 547c593dec [formerly ec40d261e5 [formerly 108a140d0b203680ed00e9c81b9271a5873ce8df]]]]
Former-commit-id: 547c593dec
Former-commit-id: b6a0a31731 [formerly fc58e7431a] [formerly 5b67b8fa2777f5d1c1e3d2378514221879eea2b9 [formerly 13a4056335]]
Former-commit-id: 984eb0a6ab87ef54eab69d0af6ddebb0e5af12f0 [formerly 0c8f3d2449]
Former-commit-id: 3dcfc90510
2013-02-27 16:19:58 -06:00
Bryan Kowal
6ec132fb7c Issue #1414 - adding Satellite to the Data Access Framework
- addressed peer review comments
- includes the CAVE generic grid resource and resource data
- the generic grid resource now utilizes the populateData method of IGridData
- the data time methods of the satellite factory will now throw data retrieval exceptions

Change-Id: I763cddc8ba8cac715eb0605594904bd9f9c21db9

Former-commit-id: 77660c9f5f [formerly a315e4461b] [formerly 4939e96872] [formerly 77660c9f5f [formerly a315e4461b] [formerly 4939e96872] [formerly 789359a779 [formerly 4939e96872 [formerly b084e4a721edc9400fc7a8f25c7da539d6dd8480]]]]
Former-commit-id: 789359a779
Former-commit-id: 83209a66b7 [formerly 03ccca567a] [formerly cc9c31268f1400d39d5c2b01410315020dcc64f3 [formerly 53a280116b]]
Former-commit-id: 814ce607bdf9b22bf2eee0779984c600ff59725b [formerly e443218bfb]
Former-commit-id: f99ad00934
2013-01-15 18:08:17 -06:00
Ron Anderson
f0def7ad04 Issue #1395 Modifed AwipsCalender and added additional date/time related widgets
Change-Id: I123a63ff4a42d36b2a35229dff719eda49097f7b

Former-commit-id: f7cbb2f02e [formerly cc883294f1] [formerly bc5f445ecf] [formerly f7cbb2f02e [formerly cc883294f1] [formerly bc5f445ecf] [formerly 43881be47a [formerly bc5f445ecf [formerly 475861fe615a070f1a3cad18dd798ba6db6b66e8]]]]
Former-commit-id: 43881be47a
Former-commit-id: cd8f3771d8 [formerly 01081fe723] [formerly 4cf2d90e058f019ff51a78b9bc82342a2dd98b36 [formerly 641d268bd8]]
Former-commit-id: 53d593cfd8a4d833625f15d65100d87532bbfea4 [formerly bd7162eca5]
Former-commit-id: 958957d603
2012-12-11 13:31:05 -06:00
Ben Steffensmeier
ab014b8e50 Issue #1316 pass original constraints through when doing time queries in derived parameters.
Former-commit-id: a1d2334cc2 [formerly a1fc232a19] [formerly 7061c6db78] [formerly a1d2334cc2 [formerly a1fc232a19] [formerly 7061c6db78] [formerly f6a502fb78 [formerly 7061c6db78 [formerly 5f67639bdd24711dc6f77b41163f49bf8626b7d3]]]]
Former-commit-id: f6a502fb78
Former-commit-id: 5e691cd77e [formerly 27b77f735d] [formerly d52026c91b0f3d62567a0c61038fb292b4782a74 [formerly 59a00a75f9]]
Former-commit-id: e1c30436b2786ca9df79538b772b6a010ac347ff [formerly d08d71d471]
Former-commit-id: ce495bd549
2012-11-21 14:21:01 -06:00
Dustin Johnson
eb82c7672b Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly acd4cf94d8 [formerly efd3d3735a] [formerly 064ef82d1e] [formerly 1dbeb22893 [formerly 064ef82d1e [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]]]]
Former-commit-id: 1dbeb22893
Former-commit-id: cd5faf58bf [formerly 2d1e886cf3] [formerly 6b7958c5dca22552e39ad9f77a0bdd977908f9dc [formerly 4222b24d09]]
Former-commit-id: 58274565203c021076e001f24f089a98cd2216f6 [formerly 6613c51d3b]
Former-commit-id: b4a13190ad
2012-11-08 09:57:16 -06:00
Dustin Johnson
4bc4d95b21 Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 7d0e4a6e75 [formerly 8e69107b5a] [formerly 98d7beae50] [formerly 31d7d09c10 [formerly 98d7beae50 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]]]]
Former-commit-id: 31d7d09c10
Former-commit-id: fe8a2a3b09 [formerly e7a0f96a9a] [formerly 465044dd2793505eba62cb46e6b3a8ac48623765 [formerly bcf575966b]]
Former-commit-id: df421cc2225941d22d1932b1c7a86fb3bdad68ce [formerly 4d9c945388]
Former-commit-id: 931d94d1de
2012-11-01 13:36:06 -05:00
root
73466bae44 Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly bb7b5341dd [formerly 0987fc6b3d] [formerly cb46f57879] [formerly 5a453ee984 [formerly cb46f57879 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]]]]
Former-commit-id: 5a453ee984
Former-commit-id: 791f3f5b85 [formerly 537dbadf64] [formerly 9fa79e8d9e9e82e29b8bae3cd42dbb3e0f9f0f26 [formerly 8a66b2f209]]
Former-commit-id: 167e4e289205b778c1de6873be7610daf3a39f5f [formerly 1792158ef8]
Former-commit-id: 0eb9520e15
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
37a4b4cc86 Issue #704 remove obsolete edex kml and add kml to develoepr feature
Former-commit-id: a93f42b3ec [formerly b7326d0979] [formerly 79ba6c2cd5] [formerly a93f42b3ec [formerly b7326d0979] [formerly 79ba6c2cd5] [formerly 6f2e2b2cea [formerly 79ba6c2cd5 [formerly 067bfaab551c3c061ecfa8defba7d90c3e34b81a]]]]
Former-commit-id: 6f2e2b2cea
Former-commit-id: 0e3a60ff34 [formerly 7238645490] [formerly e840f22756ff0b76e4cec15c0dc672b7efda26dc [formerly 1513500d7b]]
Former-commit-id: 57fbe2a27029d13fd085bbf8ba9067500c2cc925 [formerly 571fdce958]
Former-commit-id: fbc750bd7e
2012-06-28 14:07:48 -05:00
Bryan Kowal
fff0ad3727 Issue #762 - Remove all plugins specific to the 11-Collaboration Work Assignment.
Former-commit-id: 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 4d7c909f5d [formerly ec395ae134] [formerly 96f987631c] [formerly 966c50ed06 [formerly 96f987631c [formerly 74c2228d9b0c924b83d99e92fb5da733ec6e8d28]]]]
Former-commit-id: 966c50ed06
Former-commit-id: 7ff1e3ec1e [formerly 07b8c70b1b] [formerly 9e66bcbf05fd841edc4760a6ff074c97a234fd5c [formerly ff0c86f857]]
Former-commit-id: 9eddd502462b27d3fe6c7131e4428d9987e86831 [formerly 6d4946e753]
Former-commit-id: 89ab662ecf
2012-06-18 11:51:47 -05:00
Steve Harris
c76fddc7e4 Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly bcc12e03ed [formerly 572e1bb476] [formerly 27bc369818] [formerly 58037cb5d1 [formerly 27bc369818 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]]]]
Former-commit-id: 58037cb5d1
Former-commit-id: 43f936900c [formerly 9c9e01dbda] [formerly ec875d4e25b0d41a71abbea662364ddefd6fe144 [formerly 63ea8599d7]]
Former-commit-id: c26989a65231e5bf4f604b7a06a750251f0cd612 [formerly 7978d3b640]
Former-commit-id: 1d2ad9224a
2012-05-09 13:14:00 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
2012-04-18 15:18:16 -05:00
Roger Ferrel
8a3106597f Issue #244 Inital creation
Change-Id: Ib73fdcccc4e5b521deae2249024bdd1464996ab4

Former-commit-id: 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 5e63f5b576 [formerly c62418dcf3] [formerly c26e98376e] [formerly 3161380f4d [formerly c26e98376e [formerly 25cee2c90c2403e31f27b67fd49d312d31baa575]]]]
Former-commit-id: 3161380f4d
Former-commit-id: f406bca886 [formerly 0cf600a16c] [formerly c93492e46d7634f4442b5821cc164ccf698b4647 [formerly ccfadae952]]
Former-commit-id: bc19aec92806023c18ecd79ed56f4c1f0e6131e4 [formerly 8395a3937e]
Former-commit-id: 192093aa37
2012-03-06 14:08:39 -06:00
root
7dbd17a5aa Initial revision of AWIPS2 11.9.0-7p5
Former-commit-id: 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 133dc97f67 [formerly a02aeb236c] [formerly 9f19e3f712] [formerly 06a8b51d6d [formerly 9f19e3f712 [formerly 64fa9254b946eae7e61bbc3f513b7c3696c4f54f]]]]
Former-commit-id: 06a8b51d6d
Former-commit-id: 9bb8decbcf [formerly 8e80217e59] [formerly 377dcd10b9 [formerly 3360eb6c5f]]
Former-commit-id: 377dcd10b9
Former-commit-id: e2ecdcfe33
2012-01-06 08:55:05 -06:00