Nate Jensen
|
0ca327d293
|
Merge "Issue #2361 fix scan alarm dialog" into development
Former-commit-id: b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly b2629b9d22 [formerly 4c1a3fbd1e] [formerly 3a8650ef28] [formerly 532d9f1bbe [formerly 3a8650ef28 [formerly 75265b17f65de80f0a0400d29a446cadbc619953]]]]
Former-commit-id: 532d9f1bbe
Former-commit-id: 9dd39289ef [formerly 32ecd61eae] [formerly f2c56097835e64f08a5d48331e7d3b30ef221a5d [formerly 64fdaa70d7]]
Former-commit-id: c51dde3dede79cee33009add35b4685dbb824a18 [formerly 2b3fc9fbc4]
Former-commit-id: 21585af43f
|
2013-10-17 14:20:52 -05:00 |
|
Nate Jensen
|
85b08d82c4
|
Issue #2361 fix scan alarm dialog
Change-Id: Ida44a00730fa14e3c161b4a8bf1ff630701cc426
Former-commit-id: 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 413ac9b322 [formerly 3ffc8c6c82] [formerly 31a01a7887] [formerly 81fd87d9dd [formerly 31a01a7887 [formerly 566e8591050b83698d5d782f5a5d7885d1327534]]]]
Former-commit-id: 81fd87d9dd
Former-commit-id: ca63e8a2ee [formerly de55e62614] [formerly 3d0e510f23ea361cf143bfcee0bba966812d2c43 [formerly 4cd95b545b]]
Former-commit-id: 2febf7adf758c1dc164341a41c7debbbf9d50144 [formerly 17015834e9]
Former-commit-id: 33634c9cab
|
2013-10-17 13:55:19 -05:00 |
|
Slav Korolev
|
d362851509
|
Issue #2455. Fixed a problem with Changes Applied window. Corrected.
Former-commit-id: ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly ba5556762c [formerly 604d542c63] [formerly 93b69bd6a7] [formerly 4100629b39 [formerly 93b69bd6a7 [formerly c07a918474361d83907fb8de03538ec88486016d]]]]
Former-commit-id: 4100629b39
Former-commit-id: 80b0798d4f [formerly b3ec990f41] [formerly 9cc2d94fd6c5402787966d92170a9231e42ba36d [formerly 552789c978]]
Former-commit-id: 6715466f9b955837b01362479c75beb22132958d [formerly da45dbe1cb]
Former-commit-id: f3bc00b095
|
2013-10-17 14:17:11 -04:00 |
|
Nate Jensen
|
0f702b917c
|
Merge "Issue #2460 Product browser display of adhoc subscriptions Change-Id: I9c045b781adb41468d395b67a837c9a862744447" into development
Former-commit-id: 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly 82511938a0 [formerly decb9980fc] [formerly 8ef0c6e84e] [formerly c8633d47cf [formerly 8ef0c6e84e [formerly 261a4f821cf2276849f3aab67f407147448ed979]]]]
Former-commit-id: c8633d47cf
Former-commit-id: 5637ba654f [formerly 1ca5f5fb4c] [formerly 3e0d80ff1a8f1fa9f0d4d551118a63138ae2a7e7 [formerly 268da5555e]]
Former-commit-id: 4d7d972d3a2d0b899fe5d562693efaa21888d703 [formerly 3490e0556f]
Former-commit-id: c26d55c517
|
2013-10-16 15:14:42 -05:00 |
|
Nate Jensen
|
343c2efd82
|
Merge "Issue #2389: Update NotificationManagerJob" into development
Former-commit-id: 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 5df556279b [formerly 7617fa37e3] [formerly 4d7125ecc5] [formerly 697d0f8853 [formerly 4d7125ecc5 [formerly 9bd7ddeeb1e850eb1f8729f556fa46d5c70dc342]]]]
Former-commit-id: 697d0f8853
Former-commit-id: 128de383e2 [formerly 8f9ca27d50] [formerly fa6ee5f1dc33049e03880939e3155710f83ede24 [formerly b11c8e5c06]]
Former-commit-id: 8035686ac272bf01049f7c9ff6f557508223f647 [formerly 5ac7bc57f2]
Former-commit-id: 209d938d7d
|
2013-10-16 09:33:25 -05:00 |
|
Dave Hladky
|
e9dec56920
|
Issue #2460 Product browser display of adhoc subscriptions
Change-Id: I9c045b781adb41468d395b67a837c9a862744447
Former-commit-id: e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly e14b51258b [formerly 7b6ef7ee9a] [formerly 6076f46549] [formerly 477fbd3d59 [formerly 6076f46549 [formerly c504c44750f5f441be41c20fdb78a363c620fb3d]]]]
Former-commit-id: 477fbd3d59
Former-commit-id: aa5fd1ba3f [formerly 9880c82a36] [formerly a483ea67e7e78c9b17eaf6a48fb26ebec56271c3 [formerly 639019eff1]]
Former-commit-id: c88b0194e09755a944f026679b6a3c33a0aad9c3 [formerly 8a1f070927]
Former-commit-id: 33bd8d5cc4
|
2013-10-16 09:06:00 -05:00 |
|
Richard Peter
|
75d2a9e30a
|
Merge "Issue #2473 Remove unneeded ncgrib functionality. Change-Id: If38138650660c75745091a82c231cd0fe8c92e38" into development
Former-commit-id: 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly 596907fdf1 [formerly 74d34e7fb3] [formerly 9b987e8000] [formerly e1a0403c01 [formerly 9b987e8000 [formerly 1fb60210f841ee2ee9f127db33fe30df4222ff57]]]]
Former-commit-id: e1a0403c01
Former-commit-id: bd18628df9 [formerly 00f89efbca] [formerly 020e5955a6649bd7d4bb4c47058c6a42a54c0392 [formerly 4c983c7429]]
Former-commit-id: a564bbbd30c335f47363be07d4322f13adf3bcd8 [formerly 9b83504b42]
Former-commit-id: 00ea2b7c6d
|
2013-10-15 16:36:38 -05:00 |
|
Ben Steffensmeier
|
3af445a37a
|
Issue #2473 Remove unneeded ncgrib functionality.
Change-Id: If38138650660c75745091a82c231cd0fe8c92e38
Former-commit-id: 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 0c0e339894 [formerly 10f74a1812] [formerly d25df40634] [formerly 51cd71c373 [formerly d25df40634 [formerly 49a3700d37c07f42991f7ca4a65f0fd4c7010f91]]]]
Former-commit-id: 51cd71c373
Former-commit-id: 50f81cf656 [formerly dcae8c6aa2] [formerly 91c71836947d0b2aea377fc28fa97fda33b6fd59 [formerly 24a6795677]]
Former-commit-id: ec49165c9e367122a2e3115a12c8a3e00aa1dbca [formerly 92828fbaa0]
Former-commit-id: 9ed413f0c2
|
2013-10-15 16:30:38 -05:00 |
|
Nate Jensen
|
fdfcd1ae84
|
Issue #2361 Added startup timing statements
Change-Id: I347b3e671ecd7c7c61b88e008e2d4c56d19e6108
Former-commit-id: 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly 0d7d2257cc [formerly 3f107e931f] [formerly 323f594de4] [formerly d265f4ddf4 [formerly 323f594de4 [formerly 3f93aeeb8259600b1c6e0ff47641ff95337df605]]]]
Former-commit-id: d265f4ddf4
Former-commit-id: 84b16b89b5 [formerly 521c019757] [formerly 02d772fe8febbecc8657a8eacb5c61f6d3d41e3e [formerly d72a7f3c69]]
Former-commit-id: 5e12a372b6d817c05bc8593e1177b5c178c81b98 [formerly 4b2855e7cb]
Former-commit-id: ed1eb0adaa
|
2013-10-15 14:23:59 -05:00 |
|
Richard Peter
|
929a8dd118
|
Merge branch 'omaha_13.5.3' (13.5.2-10) into development
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/ifpnetCDF.py
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/purge/gribPurgeRules.xml
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly cbf18e7a32 [formerly cbf53120dd] [formerly cd504e4e98] [formerly 0787e7cc86 [formerly cd504e4e98 [formerly 1af6e051089c8f0a216307647e044d19d41f6828]]]]
Former-commit-id: 0787e7cc86
Former-commit-id: 210927720b [formerly 9896b051c1] [formerly 36f2423845a35dba4181db0c68f0634fbfc9eaef [formerly 1a62020265]]
Former-commit-id: 18e091b61bbc0c33f4f15918e97355378cbc6ded [formerly 03a58dabb2]
Former-commit-id: a8f823447e
|
2013-10-15 11:36:12 -05:00 |
|
Mike Duff
|
d09d95d827
|
Issue #2477 - Fix bug in group settings in create sub dlg.
Change-Id: I32921ec989bb72cfbaea898af5b696c18d514f4c
Former-commit-id: 78e2aab777 [formerly 9e2a8a0e04] [formerly 1485ddd779] [formerly 78e2aab777 [formerly 9e2a8a0e04] [formerly 1485ddd779] [formerly a9c8797e9e [formerly 1485ddd779 [formerly 6111ef3dacff5be7f3fa80334553646b988b60d2]]]]
Former-commit-id: a9c8797e9e
Former-commit-id: 5933d330b9 [formerly 367b98e07f] [formerly 50ee7818c09a698535754beff5d683b662eb6675 [formerly 7dd6e09fe1]]
Former-commit-id: a521741947a3c2dbd26dee82673f10b7263abc66 [formerly 38cd3be19d]
Former-commit-id: e44215cb2e
|
2013-10-15 11:18:52 -05:00 |
|
Richard Peter
|
035a39e83d
|
Issue #2389: Update NotificationManagerJob
Change-Id: I3fa926a78a50e9cb6fba7ed98c6560528e3cd7e6
Former-commit-id: 50604d4510 [formerly 88ecc1c34f] [formerly 5365515f28] [formerly 50604d4510 [formerly 88ecc1c34f] [formerly 5365515f28] [formerly f84c7e9607 [formerly 5365515f28 [formerly dbf2c35fcae26d261827758318f712641937d989]]]]
Former-commit-id: f84c7e9607
Former-commit-id: 93000196be [formerly 1a999c52c2] [formerly 924a10958d9381d9077f1691ced1188d3bbab299 [formerly 9da7b5bd5f]]
Former-commit-id: 87ffb8dac747aea5d53478f82d9c7d81ed01af83 [formerly 3ea1646de0]
Former-commit-id: 82d04f3d81
|
2013-10-15 11:07:51 -05:00 |
|
Richard Peter
|
afa133d934
|
Merge "Issue #2473 Remove deprecated grib functionality Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23" into development
Former-commit-id: 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 7068ab9e88 [formerly 8f54e49398] [formerly 48b3816b84] [formerly 2d0bb0b56b [formerly 48b3816b84 [formerly 6ce82e330ef6caa5defd9252458a4b81b087d64d]]]]
Former-commit-id: 2d0bb0b56b
Former-commit-id: aef98d5342 [formerly 60e49cf211] [formerly 5c8366a821b77ac3e8b3d1bba8cee7c7d0b876ca [formerly ef49a322f2]]
Former-commit-id: 07d5598219b5927f367203b4d925b4a229cddc5e [formerly 134b78044d]
Former-commit-id: 3c88cf005f
|
2013-10-15 10:49:13 -05:00 |
|
Ben Steffensmeier
|
7a2089f2dc
|
Issue #2473 Remove deprecated grib functionality
Change-Id: I14f7df9fc9eb09a7569193efbf17c75d6af6ca23
Former-commit-id: d5eaefeeed [formerly c22ccb6c4c] [formerly cfc8bb859f] [formerly d5eaefeeed [formerly c22ccb6c4c] [formerly cfc8bb859f] [formerly 94560e37c8 [formerly cfc8bb859f [formerly 9d903e94114cacee2a6abec6f83880fa8b978180]]]]
Former-commit-id: 94560e37c8
Former-commit-id: 253ada50d5 [formerly c960405800] [formerly f70cf023d739b92df09c9ab8e0c52a3bc0acf093 [formerly 2e0698aa06]]
Former-commit-id: d5e54c8a6cadae9ca6e0e739c958b4f515534447 [formerly 2b831863c5]
Former-commit-id: 2f9bc8f6de
|
2013-10-15 10:48:29 -05:00 |
|
Mike Duff
|
33dbdaadf7
|
Issue #2386 - Fix for editing subscriptions from subscription manager dlg.
Change-Id: I0d5532648456cc1a0960fb14e9115c52d4478682
Former-commit-id: e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly e549346353 [formerly 3ac5ba498a] [formerly 15fe243ebc] [formerly 65c693d5c4 [formerly 15fe243ebc [formerly f32286059bfc661408ab16d8a6a118beffe0ce17]]]]
Former-commit-id: 65c693d5c4
Former-commit-id: 4b3f55662c [formerly 7bcffa5275] [formerly b2ab42e078ad49f585ba986c8d78ecffb7953af6 [formerly a49af4489e]]
Former-commit-id: 6e0823d08bb44ffed23e514464501e6d0b517d9d [formerly 21323fe41c]
Former-commit-id: 728959d0f8
|
2013-10-15 09:52:08 -05:00 |
|
Nate Jensen
|
3bde4778a5
|
Merge "Issue #2386 - DD Front end refactor Peer review comments Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f" into development
Former-commit-id: 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 2c3d286eb2 [formerly b1d4d2d9ef] [formerly baac431d85] [formerly 23e1817385 [formerly baac431d85 [formerly c3550fa64755f73ee2a23080a0f786a2f170e6ae]]]]
Former-commit-id: 23e1817385
Former-commit-id: 95f1de78e5 [formerly eabc32a720] [formerly f7e467ca19c87bc093a0933e116c7732cad75cd7 [formerly 7cdd1071cf]]
Former-commit-id: e12ea8f6137c2af3a337f0c56336dc6a4130ef1e [formerly 926c2ffbd7]
Former-commit-id: 528ce9cb2c
|
2013-10-14 16:26:47 -05:00 |
|
Mike Duff
|
881e2eb62d
|
Issue #2386 - DD Front end refactor
Peer review comments
Change-Id: Ie3d503dca37af3eda917c096119d1c6d40488e0f
Former-commit-id: 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 335c8ba871 [formerly 9b4daacb26] [formerly 33a5d36e1c] [formerly 83ec4daee2 [formerly 33a5d36e1c [formerly a72c1f9ad09594ddc0c0e78e78c9fccd95fd49ff]]]]
Former-commit-id: 83ec4daee2
Former-commit-id: 5913f21dd6 [formerly c4e3b900c9] [formerly 177f4fe62912fc601fc1693ee37ceb0e687c8033 [formerly 4764147f67]]
Former-commit-id: c66a8efe9c3d8a5536c47e3a9f958394809acd02 [formerly ffbbf04f05]
Former-commit-id: 14d907ac01
|
2013-10-14 15:42:28 -05:00 |
|
Nate Jensen
|
239711078f
|
Issue #2361 replace hibernatables being detected by SerializableManager with detection from open source reflections
Change-Id: I33ddc5eb2acb909d79f6d1121747dc2aa7489c2e
Former-commit-id: 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 2fb28dce46 [formerly d7e4576380] [formerly b49a2ceb2f] [formerly 40847d0edf [formerly b49a2ceb2f [formerly 16205ab7302195e99c8af69f9d24b41bca869ce3]]]]
Former-commit-id: 40847d0edf
Former-commit-id: 9d1df167be [formerly d84f47b609] [formerly 354b93b5a9315917fe3ed51f812147bc484eb332 [formerly 9e4100b0e1]]
Former-commit-id: c8ae0a88008c418e7419cfb8e0c8c5886ca02adc [formerly b506ef6a8d]
Former-commit-id: bae5313482
|
2013-10-14 15:30:09 -05:00 |
|
Lee Venable
|
402928a033
|
Issue #2474 - Fixed font memory leak.
Former-commit-id: 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly 4d3e1ef28c [formerly 7defe1efea] [formerly a9b8c2a2fe] [formerly f3a9e541a1 [formerly a9b8c2a2fe [formerly a8a78efd01f8f3ed0ee533d4eeeb9e3463d3c0f2]]]]
Former-commit-id: f3a9e541a1
Former-commit-id: bdbbcbb36a [formerly 87e40ae6b1] [formerly 6f2af17028bd11945c433b0da741649b7233a683 [formerly 36176665ff]]
Former-commit-id: ae8069f627db2670873bab2747f8719ea6f9a520 [formerly ad96ec04a4]
Former-commit-id: 921c61e094
|
2013-10-14 12:42:27 -05:00 |
|
Nate Jensen
|
38569c4203
|
Merge "Issue #2441 Initialize python interpreter asynchronously when opening localization perspective." into development
Former-commit-id: d8bd120a11 [formerly b328e8dec5] [formerly abf2fa50b7] [formerly d8bd120a11 [formerly b328e8dec5] [formerly abf2fa50b7] [formerly 93c67d2d8c [formerly abf2fa50b7 [formerly 97ac5b996bc54d949f03e6ea0f0952207e10366c]]]]
Former-commit-id: 93c67d2d8c
Former-commit-id: 0059665def [formerly 48445dd8cf] [formerly 45e15e042c739b95e6ced767efd83fd862f635d1 [formerly 85af27444f]]
Former-commit-id: 73a271d11819bb6689c4636ae2a486561e412fc9 [formerly 3bbebda385]
Former-commit-id: 41a8aec534
|
2013-10-14 11:42:23 -05:00 |
|
Richard Peter
|
428110bd5d
|
Merge "Issue #2386 - Implement the front end for multiple data type overlap rules Peer review comments" into development
Former-commit-id: e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly e1ba2afa4c [formerly 1f772816de] [formerly d8b49516dc] [formerly c056c93104 [formerly d8b49516dc [formerly 581cc8e7319216c910e71936820f7414d2281fed]]]]
Former-commit-id: c056c93104
Former-commit-id: 6a0020cf1c [formerly b6d6458ab2] [formerly 5a35bd165eea54bab27de852d18ba49301eed727 [formerly eb1ed4cda6]]
Former-commit-id: 3898c068a270fd8813d440cf2d7ec8e0d0cf5641 [formerly f4de754699]
Former-commit-id: 9f992d6768
|
2013-10-14 11:15:40 -05:00 |
|
Steve Harris
|
ccf5593d6f
|
Merge branch 'master_13.5.3' into omaha_13.5.3
Conflicts:
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly d455ad79ce [formerly 1581adfa64] [formerly 852c02c848] [formerly 545d7ca463 [formerly 852c02c848 [formerly 15ce9171f199bb062ed1374d00ae842b77c1dc62]]]]
Former-commit-id: 545d7ca463
Former-commit-id: cc5e19f181 [formerly 2f0968a279] [formerly 519ff37a80328281e8c99f985371e3ec85b3bee0 [formerly 5cf3cc1efc]]
Former-commit-id: ec984ebc0429ce76175c36247419724dd543f7d7 [formerly 714ebfb6d0]
Former-commit-id: cb671862ff
|
2013-10-14 09:28:24 -05:00 |
|
Steve Harris
|
07cacc9234
|
13.5.2-10 baseline
Former-commit-id: 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly 2f59153a18 [formerly 1efbba7a4b] [formerly 46c351de6c] [formerly c3d29c0fa0 [formerly 46c351de6c [formerly 83863a9833f309203af0ee34d503bf280e596397]]]]
Former-commit-id: c3d29c0fa0
Former-commit-id: 99dac05b85 [formerly d1f38eb936] [formerly 908adf82a3e2b56f5c1b086392c40f7024701459 [formerly 5f86804c81]]
Former-commit-id: 515de7689b19f5b8b1400a09fd953e907cea786f [formerly b74898370f]
Former-commit-id: 03953804b3
|
2013-10-14 09:59:31 -04:00 |
|
Mike Duff
|
07da86f077
|
Issue #2386 - Implement the front end for multiple data type overlap rules
Peer review comments
Change-Id: I1f0186b3e08f3013a6dc4dc3dbf7c2e0a19404bf
Former-commit-id: 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly 10f3fa86b0 [formerly c4e501aaf9] [formerly a220ff05b0] [formerly a69120c623 [formerly a220ff05b0 [formerly 69a5242579fdeacceba5ed2ce73be01e671328ae]]]]
Former-commit-id: a69120c623
Former-commit-id: 27fd5ba0fa [formerly 610c937a00] [formerly 5c24818dd9e96881368fc526e9d32dce344061c7 [formerly f9074dc896]]
Former-commit-id: d7fa01a403613e0c322898b648e1b5619df67008 [formerly eaa8e67afd]
Former-commit-id: bcabea1df2
|
2013-10-11 18:18:18 -05:00 |
|
Ben Steffensmeier
|
63aee4d933
|
Issue #2441 Initialize python interpreter asynchronously when opening localization perspective.
Former-commit-id: a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly a1fe58b934 [formerly ccf8a88f17] [formerly 89eb327bf0] [formerly c5d49b2a4c [formerly 89eb327bf0 [formerly 7d9312fbedf734f973401e21445448646ff67410]]]]
Former-commit-id: c5d49b2a4c
Former-commit-id: 44613a0c61 [formerly ae94d39ce2] [formerly 5b606b351636990de687695ed10f65eb3cc717ee [formerly c38c7d654c]]
Former-commit-id: 9dc862eaea127586ca7a3e51fe98ae5c9e020e8e [formerly a129474a80]
Former-commit-id: 0305d62673
|
2013-10-11 16:25:28 -05:00 |
|
Lee Venable
|
a52447c65a
|
Merge "Issue #2471 - fixed color memory leak." into development
Former-commit-id: 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 64b05d759b [formerly 16e5a0223a] [formerly 3b98dc699c] [formerly 06a38bd123 [formerly 3b98dc699c [formerly 1cb4839c1115ff4e65dcfd27377f81af7795ddd0]]]]
Former-commit-id: 06a38bd123
Former-commit-id: ca1a404c58 [formerly 3e95f8feb8] [formerly 4bec7eb59e1ff363c471cbf14905ea948580bf90 [formerly 82556ab7ec]]
Former-commit-id: 139e0f8cc5c19de048741f3e8e26f3bf9abee324 [formerly 34b2bbc487]
Former-commit-id: 913b363cc9
|
2013-10-11 13:02:35 -05:00 |
|
Nate Jensen
|
445acd4997
|
Merge "Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104." into development
Former-commit-id: 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly 568e5bd9f6 [formerly c6c2f50562] [formerly 8208d756c7] [formerly d5d0fab53b [formerly 8208d756c7 [formerly e4ef1dff4330a64ee3a01a03ca5293ae75fd2fab]]]]
Former-commit-id: d5d0fab53b
Former-commit-id: d3e361eaa4 [formerly fd3a19a73c] [formerly bed476bf2460c8360b48e732fa9f1b178615b422 [formerly a34777a738]]
Former-commit-id: 14d624993f388eb4c6ef74658886d48d65a93bf0 [formerly 184d23719b]
Former-commit-id: a6535a0494
|
2013-10-11 11:21:18 -05:00 |
|
Lee Venable
|
27e147ce0a
|
Issue #2471 - fixed color memory leak.
Former-commit-id: 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 0cadf82e88 [formerly 97b3c7af6b] [formerly bceb4d76bf] [formerly 61e5d5e4da [formerly bceb4d76bf [formerly a573bacadd4d9b3ea0058bb70b348372b6a21cc9]]]]
Former-commit-id: 61e5d5e4da
Former-commit-id: ffe192037c [formerly cec4aecdaa] [formerly 1e2a3f588e15979f96d0306e26a250a064445b33 [formerly 107b35761b]]
Former-commit-id: af9d2a5d5c5d15fce00cc7930b6e73f84902150c [formerly 7335826e3f]
Former-commit-id: 98baa074a2
|
2013-10-11 11:09:57 -05:00 |
|
Brad Gonzales
|
c49808a723
|
Issue #1797 Refactored registry Time objects to simplify serialization issues.
Amend: Removed OpenDAPRetrievalGenerator.java from the review.
Fix GriddedTime addCycles when cycles are empty.
Change-Id: I9fa27178e5f59252cb872314493256be7f038890
Former-commit-id: 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly 718fea35a1 [formerly ac3d87c397] [formerly 25710edd9e] [formerly bc87f2a168 [formerly 25710edd9e [formerly a01619f78bac065e7d42e28882157778aba09b75]]]]
Former-commit-id: bc87f2a168
Former-commit-id: ff0ec3ddc6 [formerly 5825fa41d6] [formerly 80e942a0903682ada751fb617334acdf3cd8b6d9 [formerly 897fdfc2f6]]
Former-commit-id: 0feb323650cbcacede4cba0bae1d36a86174332f [formerly 32dce367a9]
Former-commit-id: feef0a0b55
|
2013-10-11 10:36:53 -05:00 |
|
Max Schenkelberg
|
de1a256c47
|
Issue #2104 Fixed EnvelopeIntersection issue with inverted enveloped. Fixed various bugs that prevented proper testing of XML file attached to 2104.
Amend: Accepted ticket, cleanup, comments
Change-Id: I78649dd0268b030624888544740a8d7af3e83e97
Former-commit-id: c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly c2471fd381 [formerly b64050ff1e] [formerly 7a66a3c995] [formerly 01c0e022d5 [formerly 7a66a3c995 [formerly fb196f5b8659e568ea1406cc5c5e01aa82525a76]]]]
Former-commit-id: 01c0e022d5
Former-commit-id: 98b60f0050 [formerly dfd6ffabd8] [formerly d2fa57de0fb4cdcad01f1ef6e1a474065d10bc48 [formerly cf0ad44ee3]]
Former-commit-id: 483819660d2cb4b6cc4872b4a95029a3370fc251 [formerly 3c2f370688]
Former-commit-id: a9a73d12cb
|
2013-10-11 10:21:37 -05:00 |
|
Lee Venable
|
5bf5c7bb79
|
Merge "Issue #2464 - fixed font memory leak." into development
Former-commit-id: 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly 442865a5f3 [formerly e337b90ba5] [formerly 3a611d3f4f] [formerly feb40aada0 [formerly 3a611d3f4f [formerly 5765e3fb4ee0f7305e5ec6240caeec375dd985a9]]]]
Former-commit-id: feb40aada0
Former-commit-id: 2174aea7fc [formerly 93b93a6750] [formerly e25d2128e67f303ef6dec71f641474d70e4d5040 [formerly dc31709252]]
Former-commit-id: a1565c82d3b4f93080c914a6d50b946a5d18f82f [formerly ff8eebf909]
Former-commit-id: 334fc2ce6b
|
2013-10-10 15:29:28 -05:00 |
|
Lee Venable
|
9163052049
|
Merge "Issue #2428. Fixed memory leak for Regions" into development
Former-commit-id: e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly e2cb973876 [formerly 10c5920b90] [formerly aa27b764ca] [formerly 6282814c91 [formerly aa27b764ca [formerly 29dd5dbf962cace42e38999f075aaaa57e24f3fc]]]]
Former-commit-id: 6282814c91
Former-commit-id: 1fa0a9e763 [formerly 00f14ba5da] [formerly 93a1856b5ba4c4002a11e6208f64b92373243999 [formerly fb37fddffa]]
Former-commit-id: 2aa030ac0f467b0901a7da0f8784e23c3527851c [formerly f3c7750f8e]
Former-commit-id: e85f79ec82
|
2013-10-10 15:26:04 -05:00 |
|
Nate Jensen
|
5ad106a802
|
Merge "Issue #2361 remove ISerializableObject for hydro colors" into development
Former-commit-id: 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly 9edf04647a [formerly 59e0414d4d] [formerly 7ca0f9a251] [formerly c6a8eaa841 [formerly 7ca0f9a251 [formerly 25c12b40a85db7a4e968dccb57798aaacb089b64]]]]
Former-commit-id: c6a8eaa841
Former-commit-id: b3a270b699 [formerly 8f686c0d94] [formerly e7fcbe3bbb07cea6cb476be72d6239106fca7335 [formerly 81d1faa5d4]]
Former-commit-id: 496fe395ea2f716d97eda9913850367190202ce6 [formerly 918f7be44d]
Former-commit-id: 0825384144
|
2013-10-10 15:07:34 -05:00 |
|
Slav Korolev
|
3399fc71fe
|
Issue #2428. Fixed memory leak for Regions
Former-commit-id: 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 2b29184b21 [formerly 2c4730db16] [formerly cab603ba36] [formerly 0021d53557 [formerly cab603ba36 [formerly 899d1f6371d55056af747d8bf6dee99d0c4179c9]]]]
Former-commit-id: 0021d53557
Former-commit-id: 74fb9bb36c [formerly bd225735ff] [formerly 14b3866029e9725abb0c7991b69a2bf28a11dd22 [formerly 3631bfbeba]]
Former-commit-id: 74ecfb4c8834ca3f42313b8d89833c5de99ca36b [formerly 0babca9d58]
Former-commit-id: 4dffa06efc
|
2013-10-10 14:09:37 -04:00 |
|
Richard Peter
|
16cc098310
|
Merge "Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes." into development
Former-commit-id: a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly a4b1eb9dff [formerly e717ae510b] [formerly 8f67035519] [formerly d7db5d0219 [formerly 8f67035519 [formerly 3a704d8d903afc5629a13f478af585947954b5d2]]]]
Former-commit-id: d7db5d0219
Former-commit-id: 7dc72f9bba [formerly 3fec426da2] [formerly 68223945005706fda2640591654c8d7d4815f98e [formerly 6eae16a7dc]]
Former-commit-id: dc6e6aca3594aebe8bc757e3f6554467e5e116c1 [formerly 0eba27543b]
Former-commit-id: 2ee7444aa7
|
2013-10-10 11:34:11 -05:00 |
|
Nate Jensen
|
f5dd15ee85
|
Issue #2361 remove ISerializableObject for hydro colors
Change-Id: Icc4a1e2ebff06ff389e95563406176663000ad7c
Former-commit-id: 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 54a13cef30 [formerly 472c2693c4] [formerly 0fe5979eac] [formerly 83fafc638b [formerly 0fe5979eac [formerly f23474913e08b34d1eb82e2106549f57fd36538c]]]]
Former-commit-id: 83fafc638b
Former-commit-id: 4454f61a27 [formerly 91ddf05a6b] [formerly 67c022fe0bf860e2b4d22e1b1209c2a4000de21f [formerly 7fb250b184]]
Former-commit-id: e825e134e73f3a1676f359994457b5d27f05a078 [formerly 2e6998e999]
Former-commit-id: 5d533a8026
|
2013-10-10 10:57:59 -05:00 |
|
Steve Harris
|
fc43a80ca0
|
13.5.2-9 baseline
Former-commit-id: 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly 0093ce47a8 [formerly fdbef0e663] [formerly a28a2d3041] [formerly f36cf09d21 [formerly a28a2d3041 [formerly 948fc5e8cbbb6fa563e871417e455638fcbe154f]]]]
Former-commit-id: f36cf09d21
Former-commit-id: 13873d55c2 [formerly 7d0416293f] [formerly 9c502fedcbd501781ba7a8be644ea45c55cc5e52 [formerly 45c58e1cb3]]
Former-commit-id: 51425d8f2a233b5ad1bc16c34fa214aa28906053 [formerly be3a804cf5]
Former-commit-id: 2dc7de0754
|
2013-10-10 10:55:20 -04:00 |
|
Lee Venable
|
ea6c7ba445
|
Issue #2464 - fixed font memory leak.
Former-commit-id: 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly 9c8d1471db [formerly e3f44d751a] [formerly 1a693c5d35] [formerly e1adc2e4be [formerly 1a693c5d35 [formerly eceb0ab9c7ddc0d28d5452d9bf77888b9e58a9ac]]]]
Former-commit-id: e1adc2e4be
Former-commit-id: 6ac2e88aee [formerly 1b9ed84e9c] [formerly 5904fc15c7ce1db3e764a1a7c740a0ecbbe10705 [formerly b98e10fe06]]
Former-commit-id: e9f3b624851ceaa6ddf6d95220ace13d03f6679c [formerly b4ceef0f22]
Former-commit-id: 04c2ea53e9
|
2013-10-10 09:48:55 -05:00 |
|
Slav Korolev
|
b4b4259f48
|
Issue #2427. Fixed memory leak for images
Former-commit-id: 815b2fb40d [formerly 5dcf4a00bc] [formerly 012497bfef] [formerly 815b2fb40d [formerly 5dcf4a00bc] [formerly 012497bfef] [formerly f0aba7be10 [formerly 012497bfef [formerly 770bfd43e07cd92c2c8a3d7b3d1a07eb6d8b1052]]]]
Former-commit-id: f0aba7be10
Former-commit-id: a1e3716076 [formerly 09f00e1d81] [formerly 6d12d9ebc42f69dee6fac7843780d975a33617b7 [formerly 0b08d2bb0e]]
Former-commit-id: 1892d02d100b6b9cadc7a9f40525dace92cda96b [formerly 001a2d3cfc]
Former-commit-id: 3271455caf
|
2013-10-10 09:34:24 -04:00 |
|
Brad Gonzales
|
568f5ba997
|
Issue #2267 Fixed exceptions in casts of Collections to Lists. Fixed WMO header cr and lf format. Removed statsTemplate from modes.
Change-Id: I601b306bf944d959da05af9277ba80e184d98e30
Former-commit-id: 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 094c9dc6a7 [formerly 59f22b866a] [formerly 73e757c284] [formerly 61448cc04a [formerly 73e757c284 [formerly f776626738e4cc995bb16e87b8da66ff90289bd8]]]]
Former-commit-id: 61448cc04a
Former-commit-id: 74df786a0b [formerly aff77aa148] [formerly 3686551f045361598f2adaa4edad79f481b0d4e1 [formerly 55d242b86d]]
Former-commit-id: 9fb3511af54c1ee9e26fe40f8ed5f7f146889f9c [formerly b24299e301]
Former-commit-id: af191df5cf
|
2013-10-09 17:58:12 -05:00 |
|
Lee Venable
|
6e3304142d
|
Issue #2447 - fixed color memory leak.
Former-commit-id: 4fd007cdb0 [formerly 91cafa3d45] [formerly 527f88ddac] [formerly 4fd007cdb0 [formerly 91cafa3d45] [formerly 527f88ddac] [formerly 8d341f499d [formerly 527f88ddac [formerly fe59f0923caa13c089edb683611b986522476539]]]]
Former-commit-id: 8d341f499d
Former-commit-id: 32ddffea14 [formerly 481bc0875e] [formerly a9303f9b91f65f21c748b5e607cdaa2dcbd3375d [formerly 717ba7e08e]]
Former-commit-id: 4d5b99af447990783c85e617138c2b3b88d886b6 [formerly 409370108d]
Former-commit-id: 965c691200
|
2013-10-09 10:07:37 -05:00 |
|
Richard Peter
|
85ac6ffc2d
|
Merge "Issue #2442 Case creation no longer contains category directory." into omaha_13.5.3
Former-commit-id: 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly 7dfa5a2ea3 [formerly a7a3df7894] [formerly 2822583c3d] [formerly d409715b41 [formerly 2822583c3d [formerly 68f0f992a67d4fd523cf91b492fd9c2c56573f65]]]]
Former-commit-id: d409715b41
Former-commit-id: 146cbb29fc [formerly 2e4f22c5f0] [formerly 29a8e32f9be08d61d7f6f95d67c55d6870c981b0 [formerly c0a36a1f5c]]
Former-commit-id: fe5ae60ed7650ba9c40a52e63f0fdfebb486fa30 [formerly eefd87ec34]
Former-commit-id: 372b951488
|
2013-10-08 14:32:28 -05:00 |
|
Richard Peter
|
3f75f1804e
|
Merge branch 'omaha_13.5.3' (13.5.2-8) into development
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/comm/JMSConnection.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationInitializer.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.uf.viz.thinclient/src/com/raytheon/uf/viz/thinclient/localization/ThinClientLocalizationInitializer.java
edexOsgi/build.edex/esb/conf/spring/edex.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/cache/d2dparms/D2DParmIdCache.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisoryFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodAdvisory_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/arealFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/customTemplate.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/ffwfaw.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/flashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarningFollowup_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/nonConvectiveFlashFloodWarning_Zones.xml
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.vm
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/sws_county.xml
Change-Id: I1006c3ccd0f643cc673813c4305470fd006da371
Former-commit-id: 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly 1af5b95d92 [formerly f141fdd5ab] [formerly 9adbe25ceb] [formerly b6395cc834 [formerly 9adbe25ceb [formerly 687a47c58a0db2bb82328ffd4e36e7b3fabca542]]]]
Former-commit-id: b6395cc834
Former-commit-id: 873d2bf184 [formerly 0e7dccd18f] [formerly 2c457acf95f4418fe275e09d6d24693aa278fc9b [formerly 3abe952ca0]]
Former-commit-id: f0f8ac95083f4a299eb6e6aa1073debeb4a2953a [formerly 1895c9f914]
Former-commit-id: bc32641181
|
2013-10-08 10:59:50 -05:00 |
|
Roger Ferrel
|
04786dac99
|
Issue #2438 Changes to properly load and save retentions times.
Change-Id: I05a516f1728ad3340547d43da025c6227d7b5551
Former-commit-id: 659313ad31 [formerly a393894c67] [formerly d0f7e12518] [formerly 659313ad31 [formerly a393894c67] [formerly d0f7e12518] [formerly 0ee16e8524 [formerly d0f7e12518 [formerly c3a887ca435140ec8cd944da1afa417ad45ea3c6]]]]
Former-commit-id: 0ee16e8524
Former-commit-id: 789357a6d4 [formerly fd96bef170] [formerly 655bfac726411200a6012321c5084c55a8d6cb38 [formerly 1ba0b3f411]]
Former-commit-id: 7eae0e83b8a985102d905e80b8fe3470f6b3ae5b [formerly 1784d0d0c0]
Former-commit-id: 1759da2158
|
2013-10-08 10:48:42 -05:00 |
|
Roger Ferrel
|
e6b195d2cc
|
Issue #2442 Case creation no longer contains category directory.
Change-Id: I1a3e87ed613923f1b1420e347ebf3db31f289bd0
Former-commit-id: 18d4157f3d [formerly 05f6e752f1] [formerly e8417dec61] [formerly 18d4157f3d [formerly 05f6e752f1] [formerly e8417dec61] [formerly db49df3fa3 [formerly e8417dec61 [formerly f008a95f617258d429a94d135664e8caf6ba1743]]]]
Former-commit-id: db49df3fa3
Former-commit-id: d4fcf5732c [formerly 5843250e09] [formerly d8066daf702a921d6408efe899109455b68dda5b [formerly 6aaf813365]]
Former-commit-id: af2843fa830d02f0d625d94172ae10fa869809f8 [formerly 52d4a96b80]
Former-commit-id: 02b928ac75
|
2013-10-08 09:47:19 -05:00 |
|
Richard Peter
|
3f32cc7a8b
|
Merge branch 'master_13.5.3' (13.5.2-8) into omaha_13.5.3
Conflicts:
ncep/gov.noaa.nws.ncep.edex.plugin.stormtrack/res/spring/stormtrack-ingest.xml
rpms/awips2.qpid/0.18/SOURCES/wrapper.conf
Former-commit-id: f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly f84e84989b [formerly f0c05dc6d8] [formerly 31c87ab01e] [formerly d9eae3ea28 [formerly 31c87ab01e [formerly 3ffd20d6abb05be289fb94513e78c0137f566a53]]]]
Former-commit-id: d9eae3ea28
Former-commit-id: af9c4be87a [formerly 94d0913bd9] [formerly ff84474d44083bc5676fa6731229af076e27cb80 [formerly f4b47dda50]]
Former-commit-id: 4e8e2fc0d4cdef4da801ac692b1793e0b0aadafc [formerly 33b4f0c247]
Former-commit-id: d321c61259
|
2013-10-08 09:45:27 -05:00 |
|
Lee Venable
|
cdba1e48df
|
Issue #2443 - fixed image memory leak.
Former-commit-id: 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 7dae2b36cf [formerly 1021c25d9d] [formerly 0bacce33bc] [formerly 47f8200757 [formerly 0bacce33bc [formerly fccb24f5834dd746f6868b4390e3c17dd12dc729]]]]
Former-commit-id: 47f8200757
Former-commit-id: fc98572a27 [formerly 03c4e9a287] [formerly 43dc0958942086502dfa768b01124fa7746d0abb [formerly cd63ee8644]]
Former-commit-id: ba282d5c92d098a16eba78a72542a536bd52ee6b [formerly 162df3c8d2]
Former-commit-id: e2b44eac03
|
2013-10-08 09:39:00 -05:00 |
|
Richard Peter
|
9afa320d3b
|
Merge "Issue #1797 Separation of gridded time and abstract time object Change-Id: I9d84942140e52ec0fded1a9150d7016dec8eaf63" into development
Former-commit-id: 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly 8d8d1f4996 [formerly 9d424c212b] [formerly 2e062048e1] [formerly e2c7bb21d7 [formerly 2e062048e1 [formerly 204c2034a08cd69fc7286639f37e5ff936ecf49e]]]]
Former-commit-id: e2c7bb21d7
Former-commit-id: 55c9d3f470 [formerly 80dd506d10] [formerly 3a79334f10bfa880b8282cf69118ab055077d496 [formerly e43cd4b397]]
Former-commit-id: 2a096cf0447100b6a3d5f28db7d1dd0106f8384c [formerly 7ef56bfc43]
Former-commit-id: 54dc5aa82c
|
2013-10-07 16:19:11 -05:00 |
|
Lee Venable
|
b6fff4e6e2
|
Merge "Issue #2437 - fixed color memory leak." into development
Former-commit-id: 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly 7321f4e61f [formerly 3bfe4bf45c] [formerly 5081bbd0ab] [formerly b1d02c6a49 [formerly 5081bbd0ab [formerly b7691a4e940cc3461a39cce871c6de15110bf1d1]]]]
Former-commit-id: b1d02c6a49
Former-commit-id: ca281660c6 [formerly ee63fc9004] [formerly e2df9e89f7153660d6c4bffe212ef2cb3e805d3e [formerly 4060fa7e0b]]
Former-commit-id: af0c173990abaff7d9fea09cc035f1eaafcda70b [formerly 13a8614130]
Former-commit-id: db4f3fd35a
|
2013-10-07 14:13:56 -05:00 |
|
Lee Venable
|
60fc2554e9
|
Merge "Issue #2421 optimize color map loading. Change-Id: I871ddf0f3eabee0e27d858e2cfa897563875c304" into development
Former-commit-id: ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly ccb9b15f8c [formerly f94bcf4776] [formerly eeee5c7948] [formerly c01eb85e53 [formerly eeee5c7948 [formerly 7139b6fe32b6de8c87c96e3b55d6ad83f11b149a]]]]
Former-commit-id: c01eb85e53
Former-commit-id: 54975835b5 [formerly 18bbfeb4cb] [formerly 44f2874ed6741bb80dbe72b605f855a78f686c71 [formerly 72a6650958]]
Former-commit-id: 16d3cd33db591cd73e2703d41edeab7fa50c3643 [formerly f34b07d207]
Former-commit-id: 61201849dd
|
2013-10-07 13:56:50 -05:00 |
|