Brad Gonzales
314039d80b
Issue #951 added Appender EnvConfigurableRollingFileAppender.
...
Change-Id: Icfab60803c647afad6aa30e516083e46b27be75b
Former-commit-id: b384c8372b32df3284344b383c3274b384c8372b32df3284344b383c3274d10cabc9174b383c3274d10cabc91705314b86772ea400570441dc92ba3ab9937ef456f4e27386cd
2012-09-13 07:50:56 -05:00
Roger Ferrel
773136c54f
Issue #1155 changed default WMO id to 'blank'.
...
Change-Id: I1374b7584545e1510745882972e96011fd6db128
Former-commit-id: 758b90b2b365b8cd58c3d61f796f31758b90b2b365b8cd58c3d61f796f3100d7dea2ebd61f796f3100d7dea2eb63725482a31b76eec288c6bbd04898789e5f513d731fcd6f3c
2012-09-12 14:55:15 -05:00
Nate Jensen
8648c59a64
Merge "Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed." into development
...
Former-commit-id: 761795bbae3c240d326989fb0a5bee761795bbae3c240d326989fb0a5beebb68c9360789fb0a5beebb68c9360743c2ee43584f457a34b950c95b06f95b6f330da689447077ee
2012-09-12 09:18:24 -05:00
Steve Harris
e78abbb503
Merge branch 'ss_builds' (12.10.1-3) into development
...
Conflicts:
cave/com.raytheon.uf.viz.ccfp/src/com/raytheon/uf/viz/ccfp/rsc/CcfpResource.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileLevel.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/tile/TileSetRenderable.java
cave/com.raytheon.uf.viz.kml.export.feature/build.properties
cave/com.raytheon.uf.viz.kml.export.feature/feature.xml
cave/com.raytheon.uf.viz.kml.export/src/com/raytheon/uf/viz/kml/export/graphics/ext/KmlSingleColorImageExtension.java
cave/com.raytheon.uf.viz.truecolor/META-INF/services/com.raytheon.uf.common.serialization.ISerializableObject
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
cave/com.raytheon.viz.ghg/src/com/raytheon/viz/ghg/MakeHazardsAction.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
rpms/awips2.core/Installer.edex-environment/wes2bridge.files/deliverables/scripts/edex-environment
Former-commit-id: 2f57e328fef94db138cd64d4e2bded2f57e328fef94db138cd64d4e2bded012c52681664d4e2bded012c526816047003d8c0b14d30591b41c82361f7bba73380ca3bec22460f
2012-09-11 16:57:03 -05:00
Max Schenkelberg
6b5b4197a0
Issue #1164 Revereted Friedman changes to time matcher over last 5 months. Fixed original issues for DRs 14699 and 15160 by getting rid of setTimeList on AbstractTimeMatcher and instead calling redoTimeMatching when a resource is added. Also made time matching happen in job when resource is removed.
...
Change-Id: I7f72f9782f0f28b25a202e48e5391d1ad34ce91d
Former-commit-id: 5e94274b98a6cc869ada7294025e265e94274b98a6cc869ada7294025e262f8f1ce9b27294025e262f8f1ce9b21e81c703f152e812ec0ec26d21d9081badd11cdbfbc35a39d4
2012-09-11 16:27:41 -05:00
Steve Harris
9d4e230e7a
12.10.1-3 baseline
...
Former-commit-id: 0403e7d0a9de1639aea221f430062b0403e7d0a9de1639aea221f430062b969e7e6dfd21f430062b969e7e6dfd64699fa90bf376a4b4db438d139fddfaadb515295030894212
2012-09-11 16:00:38 -05:00
Steve Harris
4ccea19158
12.10.1-2 baseline
...
Former-commit-id: bb190a66a1dde1f4c54d250f0ccac9bb190a66a1dde1f4c54d250f0ccac9a66f3f4b60250f0ccac9a66f3f4b60406bde9fd0ec74f638e534d2ddee9dcc3c3dadee5684a84a46
2012-09-11 15:50:57 -05:00
Nate Jensen
bc128f06d5
Issue #1096 fixed sampling order
...
Change-Id: Ib5fa01c281a50f792abc6a813167455c51076bed
Former-commit-id: a6252ceab2cb9dd60490c6b07f3672a6252ceab2cb9dd60490c6b07f3672d58af3e377c6b07f3672d58af3e377f4f6bca08ca89972765254cf5ebca4d0ba18435c346b652757
2012-09-11 13:11:23 -05:00
Lee Venable
3835e1f717
Merge "Issue #1161 Fixed anomaly with RFCFFG and graph QPE times" into development
...
Former-commit-id: c1d6d8e77a1f86d2c4ba056e74d3cfc1d6d8e77a1f86d2c4ba056e74d3cf83fc018f38056e74d3cf83fc018f38b921d8300c782593a1181d0bdbd25c83c441319e4d0edf403e
2012-09-11 09:15:47 -05:00
Nate Jensen
43c79a395f
Merge "Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view." into development
...
Former-commit-id: bdbaa715754d91b0a15ae61076b316bdbaa715754d91b0a15ae61076b3167c1bc79df7e61076b3167c1bc79df7b859c18e1d8d36456626cc8fae1099ab3f9e78478c89211dd7
2012-09-11 09:06:26 -05:00
Dave Hladky
b1ad95f547
Issue #1161 Fixed anomaly with RFCFFG and graph QPE times
...
Change-Id: I23212f3281290d86621e72c88478b00d37336494
Former-commit-id: 7ea265580533f222783d28912552fe7ea265580533f222783d28912552fe6818408d4028912552fe6818408d40566007c43802b00ddf47655939bba78f3447ff9b2114682424
2012-09-11 08:56:51 -05:00
Mike Duff
e09895120e
Issue #1162 - Fix for NCEP/Hydro menu RFC mosaic displays.
...
Former-commit-id: 4180c20fbe269d2831d9bcafd807c54180c20fbe269d2831d9bcafd807c57825863940bcafd807c578258639404a392f3a7ee443d5b5dadb6ac1594e45e84531a6195e71243f
2012-09-11 08:50:55 -05:00
Jonathan Sanchez
b0dd12e275
Issue #1006 fix supdirs
...
Former-commit-id: 6e1be0b967d2f448754309bdc765e56e1be0b967d2f448754309bdc765e544d21bfe3609bdc765e544d21bfe369230cfe187f66eebab84b048808367ec0294864a5a0abaaa9e
2012-09-10 17:39:36 -05:00
Lee Venable
00b32ea829
Merge "Issue #1159 No longer wrap text pasted to empty text field." into development
...
Former-commit-id: 97a9c874908f95f21e6ab22bd12fad97a9c874908f95f21e6ab22bd12fad903c220ecbb22bd12fad903c220ecb94a11a269b9d55815fcff1a836d0bbef57279c968272ed7387
2012-09-10 15:13:47 -05:00
Roger Ferrel
2cc43fc135
Issue #1159 No longer wrap text pasted to empty text field.
...
Change-Id: I03cc61a4d6d158344c0dbdbbed8be7edeb9cc42d
Former-commit-id: 915ded00c4fd1be035c3ef9634dd96915ded00c4fd1be035c3ef9634dd96e55c9ca0bdef9634dd96e55c9ca0bd15e909852937cffe02b0aa036adf6dd9e4fdb6a3c77a82828b
2012-09-10 13:25:29 -05:00
Max Schenkelberg
376809e2b4
Issue #1138 Changed LocalizationFile.protectedFile from boolean to LocalizationLevel so the protected level is specified if the file is protected. That way the file browser knows what level the file can be copied or moved to. Made speed improvements to perspective when refreshing files and consolidated different ways of doing same thing. Made all localization actions check protected level when setting if enabled or not. Added tool tip to protected files to show they are protected in view.
...
Change-Id: Id6862f29f431dd79758e39282659a670fe3a1536
Former-commit-id: f7abe9ee396d78afd42380439b309bf7abe9ee396d78afd42380439b309b84658dd03a80439b309b84658dd03a827ef7301bd2d74fac2020f5d966db264bc403d629ab00a4cb
2012-09-10 10:45:37 -05:00
Brad Gonzales
a2d47dee93
Issue #1156 sort by ts_rank in the TimeSeriesDataManager ingestfilter query.
...
Former-commit-id: 87def306af85961a3d6df2b97d317087def306af85961a3d6df2b97d31701b028a6d54f2b97d31701b028a6d5439b0c07947edaaac843db7c9603d02283f084c28e75a25b118
2012-09-10 09:24:28 -05:00
Roger Ferrel
e5427ade0d
Issue #1145 Modifications to AlarmDisplayWindow and CurrentAlarmQueue to handle accumualte like AWIPS 1.
...
Change-Id: Ib5a17f309a2c0ee832028ae1cc8677641e9a0377
Former-commit-id: 2a34cf0ac23de56714fbce5430a6252a34cf0ac23de56714fbce5430a625caff5053cbce5430a625caff5053cb6a6f27bd448926d7a65bb287d102a7dfc3f135efbe580ea44c
2012-09-10 08:28:58 -05:00
Ron Anderson
a457539c80
Issue #1144 Fixed sizing of Local Effects Area dropdown.
...
Change-Id: I3a0f0947dd62794445658e2af848f5c2509f66d5
Former-commit-id: 88ba04e7918ca431ab8bee7985bd5788ba04e7918ca431ab8bee7985bd5716260530e9ee7985bd5716260530e9064d7a2afce0e3e4a044309196b6e186455f1e6a8f85204091
2012-09-06 17:44:00 -05:00
Bryan Kowal
1bfa55285b
Issue #1141 - Merging KML into the Common Baseline
...
Former-commit-id: 2f7fae43cc8d444b35d33180ae0c572f7fae43cc8d444b35d33180ae0c577b456330973180ae0c577b45633097c17cb133e023c607980ab63d426e0f60c3fb248f675fdff183
2012-09-05 18:39:08 -05:00
Max Schenkelberg
e6344fb405
Issue #29 Changed how TileLevel calculate pixel density to make densities more consistent between granules on display. Changed TileSetRenderable level change threshold to smaller value so displays look less pixelated with new pixel density calculation. Fixed FileTreeView from throwing errors if two definitions with same name defined which came to light from NPP build
...
Change-Id: I66b556b74e1a856dace5447c4b9f090d026c493c
Former-commit-id: e06d1dabefa14d5d4c86c183a0e614e06d1dabefa14d5d4c86c183a0e61428d6308444c183a0e61428d6308444e7b2f69ff345d6b7bcb587bcbdb4cc4f86d1c8199980bf4f49
2012-09-05 11:51:38 -05:00
Ben Steffensmeier
ac770a948b
Issue #1131 Change behavior of Clear Action in D2D to always close Non-map editors
...
Change-Id: I4ad0516be0fc72111d91f50bcf099a45ec0d38f8
Former-commit-id: 513bd44ba0dc6f5805ef4272f4c885513bd44ba0dc6f5805ef4272f4c885c618ee90574272f4c885c618ee905749524b910966e9b24e51e0a4fe2c4364ef6f58f144d8021a72
2012-09-04 13:41:10 -05:00
Steve Harris
46d05b60a1
Merge branch 'ss_builds' (12.10.1-1) into development
...
Former-commit-id: 319927240c0e046d847abba4eb12d0319927240c0e046d847abba4eb12d0af106f1d29bba4eb12d0af106f1d2920e088a957f224e3e8ad53e29f59e4e9582cb789f8e7459dfb
2012-09-04 12:11:03 -05:00
Steve Harris
bc97cf788a
12.10.1-1 baseline
...
Former-commit-id: 7248f8b7620abf64b77c195158c0047248f8b7620abf64b77c195158c004d708932029195158c004d7089320299f4fa7bf83e720b8ed317bd9c63dc7d65f35ffe9a924a8347a
2012-09-04 12:07:27 -05:00
Steve Harris
e38cbf019b
12.9.1-12 baseline
...
Former-commit-id: 6784576fc94bf4f0043a948766c3876784576fc94bf4f0043a948766c387150bc967a5948766c387150bc967a515fa63819d782941ccc19311c1737e38aa573545c1e601dc30
2012-09-04 11:47:38 -05:00
Steve Harris
e4a69a14b7
Merge branch 'ss_builds' (12.9.1-11) into development
...
Conflicts:
rpms/build/i386/build.sh
Former-commit-id: 9ff4f369a4f52c8b374d3a9d4961e29ff4f369a4f52c8b374d3a9d4961e234cbde41243a9d4961e234cbde4124a3a1864f56ffe253196a3230e0b2465b4ee818b7b63855f152
2012-08-30 14:40:34 -05:00
Steve Harris
aec9addbfc
12.9.1-11 baseline
...
Former-commit-id: a2bb1dabe0d07c18918d6eb6b0909ba2bb1dabe0d07c18918d6eb6b0909bfc405efab76eb6b0909bfc405efab7503b7bf15cdc5ec3d16da14374fcd4f401755cde982804ee0e
2012-08-30 14:36:12 -05:00
Steve Harris
cba4faf995
12.9.1-10 baseline
...
Former-commit-id: 264d870cbfbdb45cdfae3adc50a783264d870cbfbdb45cdfae3adc50a783cb9b80f3a03adc50a783cb9b80f3a0c704490769f43a5af47fdc08c5a71a5bb474d33cede38c4b3f
2012-08-30 14:28:27 -05:00
Max Schenkelberg
4ae2b6c0e3
Issue #29 Made MasterDerivScript check sizes length for accurate dimensions of data in record
...
Change-Id: I2ea1ced515b8324a4686d9bb9c0eab7654be6ca4
Former-commit-id: d0160a4aa981531873e000de2922e1d0160a4aa981531873e000de2922e10de737ad6400de2922e10de737ad64e2e9969448ef8ed151a9b75fad8e3048a74eba41f61b465148
2012-08-29 18:17:30 -05:00
Nate Jensen
5bb78e30fa
Merge "Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs" into development
...
Former-commit-id: a6afe463af4c7390362996393309eba6afe463af4c7390362996393309ebb47baedad496393309ebb47baedad4e313a785b045134743b6e6661037f51c53c83f628f479985f3
2012-08-29 16:09:50 -05:00
Max Schenkelberg
0ece0757e3
Issue #29 Made fields protected in AbstractInventory in order to override how they are set for viirs
...
Change-Id: I88ecfdc10a29027fc63b9b3e4a8363743bbac7c9
Former-commit-id: e03e761b2804c3a1c678f8aef2b067e03e761b2804c3a1c678f8aef2b06781f78fa819f8aef2b06781f78fa81950a53cf8b6e593c9d56e99c8b1a968d44378e25985319c6284
2012-08-29 16:02:08 -05:00
Ben Steffensmeier
f88a15ae05
Issue #1110 synchronize sat resource init and remove to avoid concurrent modification.
...
Former-commit-id: 669d1023a8e3bb8c80c91f587e39f4669d1023a8e3bb8c80c91f587e39f437d2411b261f587e39f437d2411b2680ffe1feff68235d074436dd387007b17f2973ca9c74b28080
2012-08-29 14:24:21 -05:00
Matt Nash
1071ff2049
Issue #1101 fix gfe keybindings for frame change in collaboration
...
Change-Id: Ic6cb90ac60156429aac6c975eda834b23731e09a
Former-commit-id: 04ce96d74eba698ae69a018f590c7004ce96d74eba698ae69a018f590c70ada6ecf5f3018f590c70ada6ecf5f3d35027f45ecac1c2bb2e1242054a505c568beda71b9d645810
2012-08-27 12:16:38 -05:00
Steve Harris
713c7f04af
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
...
Former-commit-id: 948b22090c2e6842016b3ee334378c948b22090c2e6842016b3ee334378c076dccf42d3ee334378c076dccf42de34edddfbf65b91e1506a93487ab96ccac12a757f77517a280
2012-08-27 11:32:45 -05:00
Steve Harris
7f13d82b95
Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
...
Conflicts:
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java
Former-commit-id: 772c4359da51eb89eb2a91e39617cb772c4359da51eb89eb2a91e39617cba71dac6cad91e39617cba71dac6cadfd6e8d5b63dbcb28ce7787a602dfee0b647c0c9d3f44e46a6f
2012-08-27 09:53:55 -05:00
Nate Jensen
2b6c03dfd6
Merge "Issue #1096 fix memory leaks in CcfpResource" into development
...
Former-commit-id: 07ac473e55eac562204d94b7f40d1d07ac473e55eac562204d94b7f40d1d168bee4bd794b7f40d1d168bee4bd7575e5e3806977664c699a2f594e35422b6406fe473ebf63e4e
2012-08-27 09:21:50 -05:00
Nate Jensen
67ef07fabf
Issue #1096 fix memory leaks in CcfpResource
...
Change-Id: Icccd4d3811327b9a1dcfdf6a5a2cc714ff92afbc
Former-commit-id: 7439c246187b62f6ac7573f428e4d57439c246187b62f6ac7573f428e4d5047441f91c73f428e4d5047441f91c132cc792f40cc8e95b0c347c13143b226092da3f89ee6e08d2
2012-08-23 18:18:23 -05:00
Max Schenkelberg
d1bc6e2b45
Issue #28 Changed ResourceList so it can be extended to allow duplicates. Removed deleted files from ISerializableObject files. Made TileSetRenderable properly issue refresh when images were still being requested. Made true color code work by only showing intersecting areas of all bands on screen. Made so shader files would be reread in if edited.
...
Change-Id: Ib2ce27522c59f25ce1cef65e6d7665e28963f081
Former-commit-id: 97759c7ce11f84ddbddf75b2cdff4797759c7ce11f84ddbddf75b2cdff47c4812b774575b2cdff47c4812b77458fb5b298816f96fa50457f506ce81d8e894dba11713f9be08b
2012-08-23 17:37:12 -05:00
David Gillingham
8dbdf09690
Issue #1087 : Enable DRT for CAVE operational mode.
...
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9
Former-commit-id: a03dfbea98f3a33e3df4f7182ae9c7a03dfbea98f3a33e3df4f7182ae9c7ec2d211800f7182ae9c7ec2d211800b33e97efd33b41cd02f4cbd3bfacfa1856f2b941d1801d7942
2012-08-23 11:21:23 -05:00
Jonathan Sanchez
b0a7548f0f
Issue #1006 Implemented urban areas. Cherry picked from development on SS builds
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Change-Id: Ife20e07ccffeb6e6f5cc4aabdc6c57c9ed6e9ff8
Former-commit-id: caaa78a98120c65a46771b45f1b6d9caaa78a98120c65a46771b45f1b6d9f646b185da1b45f1b6d9f646b185da137c2871adda1f3fe29ba09fa0b649acf62bb8d9e1a3c762b7
2012-08-23 09:27:46 -05:00
Ben Steffensmeier
da86f91de9
Issue #1033 do not load grib data on tileset creation but instead load allow it to load async.
...
Former-commit-id: bc054637f1596b48c490e1c07b5803bc054637f1596b48c490e1c07b5803a988fdf5dee1c07b5803a988fdf5def204baba47da05d2dd244f168030306ab6152235d608483d9f
2012-08-22 13:02:56 -05:00
Steve Harris
8e09b55980
Issue #915 Set the user data. (cherry picked from development_on_ss_builds)
...
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
Former-commit-id: deb39fdbea04c8c3ca558e3ecc1efddeb39fdbea04c8c3ca558e3ecc1efdb8629a0f208e3ecc1efdb8629a0f200e79416277d974aaf2779565d18b96bbe382231fc9652b48f1
2012-08-22 13:01:08 -05:00
Steve Harris
98059f9ef1
12.9.1-5 baseline
...
Former-commit-id: 77cbd6c1e5a1d931fd4461f269f54c77cbd6c1e5a1d931fd4461f269f54cf2fac3942861f269f54cf2fac39428d9faed979f7fb0b17bd572824561cb9b5c2094ed2d928d328e
2012-08-21 15:27:03 -05:00
Max Schenkelberg
4eb5624fb4
Issue #28 Finished True Color Dialog and resource to allow overriding and persisting in bundle custom ranges set from the dialog.
...
Change-Id: Ia2629964d8c31d18ec469b0f5030efb9fd87445e
Former-commit-id: 6e575aa450e404398ea6f381871fc46e575aa450e404398ea6f381871fc46e1059f8bef381871fc46e1059f8bec3f6bc5225919000d0dded033f8657587ad5d2e4fec3be6b57
2012-08-21 11:36:35 -05:00
Max Schenkelberg
950e2bff73
Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
...
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014
Former-commit-id: 79d98841a0fc06265360b69d2cad1c79d98841a0fc06265360b69d2cad1c1b406ecfcab69d2cad1c1b406ecfca56496dc03e47cefd1513aa9df46a1d362d34bee0dcbab7d58f
2012-08-20 14:47:14 -05:00
Ron Anderson
fd53117c14
Issue #436 Made hazardDict an OrderedDict so order of entries is preserved.
...
Modifed include path so procedures/smartTools are found before utilities of the same name so
existing site MakeHazardConfig.py files in procedures will be found before the base file in utilities.
Added code to default new localEffects dicts to empty so existing MakeHazardConfig.py files can be used.
Change-Id: I4a59d930f8b93bf76c28f3dec3881fbccc077eff
Former-commit-id: 0a6de388dd16231374f8d7a818fd1d0a6de388dd16231374f8d7a818fd1d7662d249abd7a818fd1d7662d249ab21b48541c36e3674f9fcd3693827a11b655b0826f69d7b9c64
2012-08-17 12:41:49 -05:00
Ron Anderson
c1d0cbae01
Issue #436 merging elevation base changes into branch off of development baseline.
...
Former-commit-id: c71ee18e6e93c632c1ff1321db6a99c71ee18e6e93c632c1ff1321db6a99819b9c8e561321db6a99819b9c8e560a32c7c683e5952c1c996eafdda705f7b9190b51b78c280ac8
2012-08-17 12:20:08 -05:00
Steve Harris
48947cc945
Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
...
Former-commit-id: 1bcd43a447735ed2ecd9fa77df807d1bcd43a447735ed2ecd9fa77df807d596d19466bfa77df807d596d19466b4d2094072eb0b8a13e6020fda57d379e75c7e5f18413f8d96c
2012-08-16 10:27:51 -05:00
root
7b6fb2ec7f
Merge branch 'reconcile' into development_on_ss_builds
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
Former-commit-id: b6e17e9b02d170ae704bb93989daafb6e17e9b02d170ae704bb93989daafba40e18fb2b93989daafba40e18fb2c8d09a5973fd69b031d23e9d1fa43064c3ccb4a484a8231c49
2012-08-15 22:29:07 +00:00
root
73466bae44
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: bb7b5341dd0987fc6b3dcb46f57879bb7b5341dd0987fc6b3dcb46f578795a453ee984cb46f578795a453ee984791f3f5b85537dbadf648a66b2f2091792158ef80eb9520e15
2012-08-15 22:15:20 +00:00
