Sarah Pontius
|
853526b594
|
VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b
Former-commit-id: d20799e942 [formerly 1ae8fe99aa] [formerly 061583cd50 [formerly 0db3944372ecc381df4e8a918829530391d598db]]
Former-commit-id: 061583cd50
Former-commit-id: bc572fc945
|
2014-11-10 11:20:09 -07:00 |
|
Sarah Pontius
|
5bb52ed311
|
VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626
Former-commit-id: 8d3958527b [formerly d7e8bc97b6] [formerly 760c0d6532 [formerly eee97946890b5b0df941e2665a4a183eece14598]]
Former-commit-id: 760c0d6532
Former-commit-id: bbe1125b56
|
2014-10-29 13:33:24 -06:00 |
|
Sarah Pontius
|
659752f3a0
|
VLab Issue #5012 - HLS/TCV files for OPG Oct-15-2014; fixes #5012
Change-Id: Iacf701775c343077102647136272c92d08776caa
Former-commit-id: 776886f5ea [formerly 8be0082cc2] [formerly cdb47ed221 [formerly c7b2c66316ccca08b56fe9ece8f8a24ec260207b]]
Former-commit-id: cdb47ed221
Former-commit-id: cfadb837bd
|
2014-10-15 10:15:30 -06:00 |
|
Sarah Pontius
|
b63394e7e0
|
VLab Issue #5001 - HLS/TCV files for OPG Oct-2014; fixes #5001
Change-Id: I4018168e958a75ff7db3dd6cfd88a4ac17947981
Former-commit-id: 3348a672be [formerly 2a96302bfb] [formerly 6dee51cb9f [formerly b7ccb5162f481e81dc50fcf63b200ab06a959cb8]]
Former-commit-id: 6dee51cb9f
Former-commit-id: 28c0e819b7
|
2014-10-14 12:04:50 -06:00 |
|
Ron Anderson
|
0dff055055
|
VLab Issue #4953 Refactored TPCWatchSrv to support TCV effort.
Change-Id: I8a5c5c7fa62235fdc6fa4d90e82ff2711e724a15
Former-commit-id: c6eb7c137c [formerly be856e2981] [formerly fa7b06c454 [formerly 9a2a6989687c749ee87291506a7ee44a6cd7e737]]
Former-commit-id: fa7b06c454
Former-commit-id: bc21b6e798
|
2014-10-08 11:51:00 -05:00 |
|
Brian.Dyke
|
64aef1a783
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 85d83aefe0 [formerly f440da9c70] [formerly 92762f46c7 [formerly 23d16004c389f0ef708bee2a8bfb84d465b7b36b]]
Former-commit-id: 92762f46c7
Former-commit-id: 4dbdf9de26
|
2014-10-03 14:04:46 -04:00 |
|
Brian.Dyke
|
46956a01c6
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: db665d3876 [formerly 2a911984f0] [formerly 20dd249d2c [formerly 441fc7561a8526422f9b73b9c47cd220f0babb54]]
Former-commit-id: 20dd249d2c
Former-commit-id: 72ea2fbe48
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
d174db3b0c
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]
Former-commit-id: f3f95aabb0
Former-commit-id: e77f1e126e
|
2014-10-02 10:38:51 -04:00 |
|
Brian.Dyke
|
277b6e4b36
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: d4888adc0f [formerly f47840e4d9] [formerly 2ac30f6c22 [formerly ece734cb6218a80fa2dda1b3c43673dc5a31bfbb]]
Former-commit-id: 2ac30f6c22
Former-commit-id: 36d377e08d
|
2014-10-02 10:24:04 -04:00 |
|
Brian.Dyke
|
0915cb28b0
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 31f073ee3a [formerly 4bc465bfbd] [formerly 97464ea153 [formerly f26e54011d334972bb1e999304b1b2d13a1c408f]]
Former-commit-id: 97464ea153
Former-commit-id: e76ee74410
|
2014-10-02 10:15:34 -04:00 |
|
Steve Harris
|
8a627b9bf6
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: 09d8955b31 [formerly e201e1a493] [formerly cc34483b0b [formerly ace8473f96c6151918ee8ecf61e3b8986d98a68a]]
Former-commit-id: cc34483b0b
Former-commit-id: d711c1b67b
|
2014-10-02 08:09:02 -05:00 |
|
Shawn.Hooper
|
9ecf241616
|
ASM #15033 - Fix IBW templates and 14.2.1 template corrections
Change-Id: I2677b93f897640318d8f89da72e49ba398d1d720
Former-commit-id: 22c3fde0ef [formerly f9428ace1f] [formerly ae02cbc2da [formerly ea8e4c3a30bceb2f3b53159317382ae651aa5531]]
Former-commit-id: ae02cbc2da
Former-commit-id: f2d7288970
|
2014-10-01 15:58:48 -04:00 |
|
Brian.Dyke
|
4df4eb9c2b
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 0be927be2d [formerly 5ed17c0e24] [formerly a4bfbea3c2 [formerly 622e63224b6d6bf1d6ced874658bbd9db381799b]]
Former-commit-id: a4bfbea3c2
Former-commit-id: 914da168c8
|
2014-10-01 15:36:06 -04:00 |
|
Nate Jensen
|
f7a075907c
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: fce7d5899f [formerly 482af416b3] [formerly f2633a56c0 [formerly e2d5957c02ba210e1964d00f37a00455f3326b37]]
Former-commit-id: f2633a56c0
Former-commit-id: 18acca9ef8
|
2014-10-01 11:53:40 -05:00 |
|
dmsys
|
07f84c6b26
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 9f4560c480
Former-commit-id: b884e5e32d
|
2014-09-30 13:45:54 -04:00 |
|
Nate Jensen
|
aa526b5dfd
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 6d382220a3 [formerly 057e5eda1a] [formerly 510d26050d [formerly 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083]]
Former-commit-id: 510d26050d
Former-commit-id: a79d34801b
|
2014-09-29 17:50:34 -05:00 |
|
Ben Steffensmeier
|
923ead3167
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: b333960362 [formerly c573db2918] [formerly 95b096192b [formerly e93157375f90c6cc2038db9a78346592e4d46b0e]]
Former-commit-id: 95b096192b
Former-commit-id: 3c55b8166c
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
dd92661aba
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: fdfe16985d [formerly 46da726675] [formerly c03bc273da [formerly 49ad8e0e780443a0439227694a92ec8ab683b125]]
Former-commit-id: c03bc273da
Former-commit-id: 7c37aaa92e
|
2014-09-29 11:14:32 -05:00 |
|
Brian.Dyke
|
3b3e81d4a2
|
Merge branch 'asm_14.2.4' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 9661a1d7b1 [formerly 0c1b83b644] [formerly 0e0255ce5b [formerly 6e79993fbf34ebd832ca07356cbac003efaf6405]]
Former-commit-id: 0e0255ce5b
Former-commit-id: 77e8985bdd
|
2014-09-29 11:55:16 -04:00 |
|
Sean.Webb
|
8a2e8285c1
|
Merge "ASM #16720 - Added pushd and cd prior to patch extraction" into asm_14.2.4
Former-commit-id: c679d1cc46 [formerly fbd892909b] [formerly 2d531d73fd [formerly c62a7e14e82c7274ed1868d73446aab895901546]]
Former-commit-id: 2d531d73fd
Former-commit-id: 1a70eea0e0
|
2014-09-29 10:35:10 -05:00 |
|
Brian.Dyke
|
886c1b7e3d
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: fce029653d [formerly 0a497fc015] [formerly 46af1d0857 [formerly 01cb1dc674ae1249d97dc10be5c068de0ed2a222]]
Former-commit-id: 46af1d0857
Former-commit-id: 85676ff532
|
2014-09-29 11:20:57 -04:00 |
|
Sean.Webb
|
1538817a38
|
ASM #16720 - Added pushd and cd prior to patch extraction
Change-Id: Iac7658d312721b1cc992a5c96a596120b6c5b225
Former-commit-id: 224cddfe9b [formerly 02e187a609] [formerly 600b75bd9f [formerly c2af0284e9146dff8431ecd4f6ce88437ea83d9f]]
Former-commit-id: 600b75bd9f
Former-commit-id: 293f860e93
|
2014-09-29 10:24:04 -04:00 |
|
Sean.Webb
|
7eebdb1a1f
|
Merge "ASM #16720 - Removed extraneous popd which was changing dir when not needed" into asm_14.2.4
Former-commit-id: 9b25583e3a [formerly dc3ad9863d] [formerly 6e1f0363c8 [formerly 8f44d89f1d11cd587106f7eda3edec93802f5cf3]]
Former-commit-id: 6e1f0363c8
Former-commit-id: 323adcd30c
|
2014-09-29 08:31:44 -05:00 |
|
Sean.Webb
|
d70bc9fd9f
|
ASM #16720 - Removed extraneous popd which was changing dir when not needed
Change-Id: I3c5521cfa0d0223cc8a6a3094d9efa7c6bf9f683
Former-commit-id: 6840d55343 [formerly 0738a41cbf] [formerly 78f83fa594 [formerly 4faea9724adf17d0bec7f013bafc7f8dd2f7499e]]
Former-commit-id: 78f83fa594
Former-commit-id: 197908686e
|
2014-09-29 08:21:00 -04:00 |
|
Brian.Dyke
|
5da730103f
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 8e459ec500 [formerly 550ffba7b0] [formerly 142432ba5e [formerly 93ddf672c137c7221e9595e8b5c1b279084cb451]]
Former-commit-id: 142432ba5e
Former-commit-id: 63e3d61ff5
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
78f7f0fc88
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 86100b6ca8 [formerly 6791e8d885] [formerly 05707d0f20 [formerly 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb]]
Former-commit-id: 05707d0f20
Former-commit-id: b3bd3a9d7f
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
ee0c04ae93
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: 858cfa1078 [formerly 41921f7db2] [formerly 814b9a2869 [formerly 60756ddb841a0daa347493047b76d2fcb93f7f4a]]
Former-commit-id: 814b9a2869
Former-commit-id: a2b18e4bee
|
2014-09-26 15:15:57 -04:00 |
|
Brian.Dyke
|
fecebad9b6
|
Merge branch 'asm_14.2.4' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.4
Former-commit-id: 2495e16947 [formerly 989a9c5835] [formerly f1755fb7ae [formerly 4ff65f7c83042dd40b5c2bf37ee54d12315c5714]]
Former-commit-id: f1755fb7ae
Former-commit-id: 8c2c886675
|
2014-09-26 14:20:34 -04:00 |
|
Brian.Dyke
|
f6af0dd0df
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 396f9755dc [formerly 1ac61fb612] [formerly f26fe97ec4 [formerly 5b570e5229628de88068edee1c70c26eec13f71a]]
Former-commit-id: f26fe97ec4
Former-commit-id: 33525968e3
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
328edcaebf
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: f520ff97b6 [formerly 8245370186] [formerly a4f68caac6 [formerly 6ed90023551e25216c10d05f2568593992326900]]
Former-commit-id: a4f68caac6
Former-commit-id: 34a073a848
|
2014-09-26 13:02:49 -04:00 |
|
Sean.Webb
|
b18f341781
|
Merge "ASM #16720 - Added updated palt.c to fix seq num in pqact pattern" into asm_14.2.4
Former-commit-id: e8585c9d29 [formerly 96503843d9] [formerly 57342f0256 [formerly d1ce11d690a1acf24fe82fc10acc83302e8f61f9]]
Former-commit-id: 57342f0256
Former-commit-id: d43119b40f
|
2014-09-26 11:01:04 -05:00 |
|
Brian.Dyke
|
30f8b55a19
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 0045c3100f [formerly 586a504500] [formerly bd983e1932 [formerly d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7]]
Former-commit-id: bd983e1932
Former-commit-id: 95d80abd56
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
f207169057
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: 1737d16a5c [formerly 33aee54b8f] [formerly db29ec9dec [formerly c8aa2fbfc35c872e2d50de2212eaf16db9b5483d]]
Former-commit-id: db29ec9dec
Former-commit-id: bda6e42529
|
2014-09-26 15:13:56 +00:00 |
|
Sean.Webb
|
9b63e571a7
|
ASM #16720 - Added updated palt.c to fix seq num in pqact pattern
Change-Id: I08d858beeae7f0fb211a3cf287b7763aa2cff9b5
Former-commit-id: eb959d100a [formerly 628ab54d68] [formerly 7d75d994c1 [formerly d59054c870fee17076aec22cd683ef1586a153da]]
Former-commit-id: 7d75d994c1
Former-commit-id: 039619264f
|
2014-09-26 10:49:37 -04:00 |
|
David Friedman
|
7f9fdcb74b
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: cfcfc17a2b [formerly 41820f112f] [formerly c85b0d1cfd [formerly 70b520c08670646047ffa753814f98c032938ff8]]
Former-commit-id: c85b0d1cfd
Former-commit-id: f6d3a80dbf
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
214002e207
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: c16f5c2e7c [formerly 5755c120d5] [formerly e82f96193e [formerly 117c2f072b647e353456832f2f0088d51a660d65]]
Former-commit-id: e82f96193e
Former-commit-id: 07befd1cce
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
a10060f45d
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 973d0b9a55 [formerly b3025aacb0] [formerly 8ab4649312 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]
Former-commit-id: 8ab4649312
Former-commit-id: c19d9ee755
|
2014-09-25 21:07:16 +00:00 |
|
Shawn.Hooper
|
b7b38c3c7b
|
ASM #600 - WarnGen: template optional watch inclusion
Change-Id: I282e94236389a907326926a68e2ed810a00b9688
Former-commit-id: 56cd6483ef [formerly da77322fd0] [formerly 831af82c23 [formerly 04bd69f437b897d63ac78d6cbd7c60451366cc6d]]
Former-commit-id: 831af82c23
Former-commit-id: a242e1c43b
|
2014-09-25 16:25:43 -04:00 |
|
Qinglu.Lin
|
94e636a862
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 1c55b5c400 [formerly 94fed71091] [formerly ef851d0016 [formerly 8b194664458246dad7509c44bcc07480cb088ddd]]
Former-commit-id: ef851d0016
Former-commit-id: 3e1d8d83a9
|
2014-09-25 15:16:42 -04:00 |
|
Matthew Howard
|
1468a50f53
|
Merge "ASM #16693 updated dictionary cleanup script" into asm_14.3.1
Former-commit-id: 8ec2860888 [formerly 7d93a588f4] [formerly 63a7fb0372 [formerly bc9c9b073e69825d5e040e1cca2f738719a7e4f7]]
Former-commit-id: 63a7fb0372
Former-commit-id: fc2d6cd5f5
|
2014-09-25 14:14:40 -05:00 |
|
Matthew Howard
|
118dfa43fe
|
Merge "ASM #16693 Fix spelling checker swear words" into asm_14.3.1
Former-commit-id: c88a228356 [formerly 128518c4d7] [formerly aaf48f3dfe [formerly 1c8a526f4f40eb4ef6fef55f9d49f8abe425b548]]
Former-commit-id: aaf48f3dfe
Former-commit-id: 8db477b8c9
|
2014-09-25 14:14:24 -05:00 |
|
Ron Anderson
|
fee7ce9822
|
Issue #3648 Fix GridParmManager.d2dGridDataPurged() to use deallocateDb.
Change-Id: Id9bb73c54028615c33a61373d7b565a230867c1a
Former-commit-id: df1d9f8b72 [formerly 7020daa55a] [formerly 34df50963e [formerly 8c177752b8e2baa2e739fc69320c4e4b31d972c7]]
Former-commit-id: 34df50963e
Former-commit-id: 86bdbd1134
|
2014-09-25 13:48:11 -05:00 |
|
Ana Rivera
|
b250aa80e8
|
VLab Issue #4836 - O&M RM14013; Update aKrtmaNDFD.xml; fixes #4836
Change-Id: I18d92482782e4c95cdd147d1edb1f65f3865b98f
Former-commit-id: 043ec96c2d [formerly 39fc13eb38] [formerly c1b58f214f [formerly cf3d9a81a52c19977371e3abee755d1c239b1f8a]]
Former-commit-id: c1b58f214f
Former-commit-id: e76f4d183e
|
2014-09-25 18:18:21 +00:00 |
|
Ana Rivera
|
1b94e7fdb2
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: e55855b4ff [formerly d96f5fe229] [formerly a72725f9ef [formerly 833cff4f37542078578de96b3b59723f77c31f4c]]
Former-commit-id: a72725f9ef
Former-commit-id: dd45d98a0e
|
2014-09-25 17:46:53 +00:00 |
|
Kevin.Johnson
|
d719e57462
|
ASM #15672 - Added initial field tested version of edexOsgi/com.raytheon.uf.tools.cli/impl/check_baseline_changes.sh
Change-Id: Ibbd6bcb2fb36c02418fb612436d7db5ba9f571a7
Former-commit-id: 7d677d0023 [formerly 5a38528711] [formerly 4d8efeeb9a [formerly c36b732cc8057cf7b830de647998f679725760da]]
Former-commit-id: 4d8efeeb9a
Former-commit-id: 498374fbac
|
2014-09-25 10:50:07 -04:00 |
|
Baoyu Yin
|
7156ed4199
|
VLab Issue #4553 - AWIPS2_DR_16047: An update for Bad rule in gridImageryStyleRules.xml for Convective Inhibition; fixes #4553
Change-Id: Ib4e566154c6b8282efb33464b850ff1f66a5e6d0
Former-commit-id: e9e3ad94ab [formerly dea223412e] [formerly c9385c0912 [formerly 847ecb836cf5d7bad28817dd68e752e4ba79f6c4]]
Former-commit-id: c9385c0912
Former-commit-id: ed0b9c0ce1
|
2014-09-25 09:44:21 -04:00 |
|
Lee Venable
|
a4843f555c
|
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
Former-commit-id: 1d52729e38 [formerly 77afac746c] [formerly 5efe3232a7 [formerly 2ec651b767555946485c8a087f891c8736f59105]]
Former-commit-id: 5efe3232a7
Former-commit-id: ef4b05effe
|
2014-09-24 16:23:23 -05:00 |
|
Ana Rivera
|
70b0854582
|
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: bb533d9ddd [formerly 535f254357] [formerly 9a0e9b17f4 [formerly 2c16492202230dcbec93cf390b47f400a77a545e]]
Former-commit-id: 9a0e9b17f4
Former-commit-id: ed7119ed4e
|
2014-09-24 20:11:29 +00:00 |
|
Benjamin Phillippe
|
13d75b618a
|
Issue #3560 Fixed slow memory leak in registry
Former-commit-id: c7d6c602bd [formerly fb8dc9fe7d] [formerly 81870960e6 [formerly 918119b26864ee246ac2571baa4e380ae21f2ded]]
Former-commit-id: 81870960e6
Former-commit-id: ccd798d7f7
|
2014-09-24 14:36:34 -05:00 |
|
Brian.Dyke
|
cf8f88a5b3
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: b49b13f77e [formerly 4b418918d4] [formerly 87fa32d2d4 [formerly e04ad21771ce410beb25e15fe300a34796a1a062]]
Former-commit-id: 87fa32d2d4
Former-commit-id: 1f09dad9e9
|
2014-09-24 11:05:37 -04:00 |
|