Brad Gonzales
b27bb93cf7
Issue #1517 Added SPC Prob menu changes.
...
Amend: Moved derived parameter files to cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/
Moved Spc.ppy to edexOsgi/build.edex/esb/data/utility/edex_static/base/smartinit/
Updated units in spcGuideNDFD.xml.
Removed local configuration menu items and tags.
Updated pqact.conf.template SPC entry.
Update SPC.py with levels.
Change-Id: I0f7a148d5e122b26c125bfee110019d5f577bdc1
Former-commit-id: 7cef72a46035cc853c74f459554e337cef72a46035cc853c74f459554e335bc6dd5498f459554e335bc6dd54983e4338339b8fc5c18ebdf3ef309293adbfa7ced17253bbf20e
2013-02-04 08:52:33 -06:00
Steve Harris
a8d7e2a51a
Merge branch '13.2.1_delivery' into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: f207d282bcc218786986658bea377bf207d282bcc218786986658bea377bec56acde81658bea377bec56acde8141b14f0fa273d9455c656383bf8ed2a74d58ce6f2107a54161
2013-01-31 10:19:14 -06:00
Steve Harris
3165545bb6
Issue #1408 - Merge branch 'ss_builds' (13.2.1-3) into 13.2.1_delivery
...
Former-commit-id: e6093b159ee655d297f70505ed0a72e6093b159ee655d297f70505ed0a7260402725730505ed0a726040272573c9bc690eca75f6e61e6f513d49939fba9715113299bc358644
2013-01-29 15:57:21 -06:00
Steve Harris
d552dc5ffb
13.2.1-3 baseline
...
Former-commit-id: b84acc06da283147571ff45120a1f4b84acc06da283147571ff45120a1f47a739c6a5bf45120a1f47a739c6a5b03989493aedaca1c3e733edfa1e0bedbaf4a3e399ab34b7aeb
2013-01-29 15:52:43 -06:00
Bryan Kowal
aa1f7e6364
Issue #1537 - fixed the edex-environment build
...
Former-commit-id: 792230a38ea960b342307116bb86ef792230a38ea960b342307116bb86effa511e980b7116bb86effa511e980ba8d1496454f4e7bead66aefeada9d6662f471e5e1377ae600f
2013-01-29 09:51:54 -06:00
Bryan Kowal
1ecf83c57c
Issue #1503 - initial commit for build of Qpid 0.18 rpms
...
-created a qpid service script
Change-Id: I380333efad2954e7a9b6d1b27dc8a497cf38acf3
Former-commit-id: 7b4935a0efec584b4d4bff34587e947b4935a0efec584b4d4bff34587e9454697ff658ff34587e9454697ff658f8e120a21945dd0b02ff0cf405d8d9ce2d246314b7f7312c7d
2013-01-28 11:21:24 -06:00
Steve Harris
5d7a0ba9af
13.2.1-2 baseline
...
Former-commit-id: 74bfe9595c0006a2b6cb7a7f7c45ca74bfe9595c0006a2b6cb7a7f7c45cac3e4551dfa7a7f7c45cac3e4551dfa0f4fcd0ba8251a9c01951153d80c5b27706b8dcbeafa141b90
2013-01-25 09:07:12 -06:00
Steve Harris
264b5bb073
13.2.1-3 baseline
...
Former-commit-id: 7d2e979c51a5a0da5c027435527b257d2e979c51a5a0da5c027435527b252b6ac028bd7435527b252b6ac028bdd069467e819d248cff7acc0fdef15c082e66584aab562e22a4
2013-01-23 11:24:17 -05:00
Steve Harris
b92dfd1b62
13.2.1-2 baseline
...
Former-commit-id: a4fa438a4133bc5fd81683e9157df7a4fa438a4133bc5fd81683e9157df7328c6dccad83e9157df7328c6dccadce726fadc7d9be4dce2147cc08ac79547c1dedd12779f5c6d9
2013-01-23 11:18:44 -05:00
Steve Harris
2c834d0f58
13.2.1-1 baseline
...
Former-commit-id: 11b05eedeb48d1aa77329771dfae6b11b05eedeb48d1aa77329771dfae6bc63f9bcae09771dfae6bc63f9bcae01d1791b3b48ed6a53113f6670806bf9146e727f908bf724a6c
2013-01-23 11:13:03 -05:00
Bryan Kowal
9d54be13f0
Issue #1490 - updated edex-environment
...
- actually include the modified files in the commit this time
- each edex environment will now receive its own instance of pypies
- a httpd-pypies port and a pypies logging port must now be specified when creating an edex environment
- the location of the pypies configuration file is no longer hard-coded; specified as an environment variable
- made the pypies tcp logging port configurable
- add source headers
- the configuration will now update the ServerRoot
Change-Id: Ie4130caad91f027c9ab547806fb014c0e708596d
Former-commit-id: 3a0114558b792c03d5f4b4964c0a193a0114558b792c03d5f4b4964c0a199e33969536b4964c0a199e33969536a9c31457b8bc757e5bc1b47d484e7075d82508527ae14fdb20
2013-01-18 12:44:37 -06:00
Roger Ferrel
815dd12ad9
Issue #1442 Changes to update display when Simulated Time is changed. Corrections to pqact.conf.template.
...
Changes based on code review and added listener to GridManager and unit test.
Change-Id: Ida593a7e3cc7d4fd9bd6f44a4455145114484650
Former-commit-id: 863bdb4d52972db123241cd076671c863bdb4d52972db123241cd076671c1e492b81ff1cd076671c1e492b81ff96deac5f4386d51634dcf10521f861722708105f0435636b1e
2013-01-16 16:53:29 -06:00
Richard Peter
0a55bcfd67
Merge branch 'ss_builds' (13.2.1-1) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 6e42fa32d3a966546e313fb7d96ec16e42fa32d3a966546e313fb7d96ec11dbb34523b3fb7d96ec11dbb34523bd880361e0679ef100838345dfd2ca9cd2014bf8de838f2db25
2013-01-14 18:07:17 -06:00
Steve Harris
e5f32a2bbe
13.2.1-1 baseline
...
Former-commit-id: 8dd688c8785dfe4d10f1e62172c8c78dd688c8785dfe4d10f1e62172c8c781849e3cbbe62172c8c781849e3cbb3d35fd52d5e34695538d8713dfc5caebff2a6275b4556ea28f
2013-01-14 18:42:21 -05:00
Richard Peter
031bae3bfd
Issue #1408 : Merge branch 'ss_builds' (13.1.2-8) into development
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/GridLookupFileName.java
ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/NcgribFileNameProcessor.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/dbscandb.c
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/proto_gemlib.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/dgdriv_c/uscore.h
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/EnsembleSelectComposite.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/rsc/NcEnsembleResourceData.java
Former-commit-id: 4e1f66abb3ae3ea75cbf1318f539024e1f66abb3ae3ea75cbf1318f53902b8e42dabc01318f53902b8e42dabc09da3b7e2ddfa6247baf7aa9e16b038096134d917ef2dc06b69
2013-01-14 17:38:38 -06:00
Steve Harris
32c48861de
13.1.2-8 baseline
...
Former-commit-id: 5aaacf4eecb864fdc303e6217a17de5aaacf4eecb864fdc303e6217a17de06b8eb8db0e6217a17de06b8eb8db013be9f89877d0109a3493caf592e83066c14dcd292f1e9416c
2013-01-11 16:19:07 -05:00
Richard Peter
7d529beed2
Issue #1408 : Merge 13.1.2-6 into development
...
Former-commit-id: 95f0508c29d0a6ba23e5029ebaa63a95f0508c29d0a6ba23e5029ebaa63a328be6ac2b029ebaa63a328be6ac2b177a54d19a80bf1d7a286a5a0d7d09709af3b25e398b47967d
2013-01-09 17:55:05 -06:00
Bryan Kowal
904678e8f4
Issue #1455 - Merge 5-Data_Delivery into AWIPS2_baseline
...
Former-commit-id: 199e202979ab8b346489c8a43edd9e199e202979ab8b346489c8a43edd9ed6b4cb65f4c8a43edd9ed6b4cb65f40e985cf0f36d7f57c62a146c43a6060136f9d5a31996f92f7e
2013-01-07 12:16:01 -06:00
Steve Harris
3e63f280a2
13.1.2-6 baseline
...
Former-commit-id: 1d4d25b49befd3392abe8e5f9e0e6c1d4d25b49befd3392abe8e5f9e0e6c59969775ad8e5f9e0e6c59969775adfe763963e982a1ed77a4dbcae57f5705bdc0ecd2b7f180d9d3
2013-01-06 14:55:11 -06:00
Steve Harris
745f2c6409
13.1.2-2 baseline
...
Former-commit-id: e8f4a2f03151208e5515c0c1d56f3ae8f4a2f03151208e5515c0c1d56f3a4ba416aeb3c0c1d56f3a4ba416aeb382cdde8491cd4185ef5c941337c553b6fa9b4858f52ec0b0a0
2013-01-06 14:32:24 -06:00
Bryan Kowal
5ca7008802
Issue #1373 - prevent file naming conflicts
...
Change-Id: Ibf3996983a0df3eee39fd5bc7d65bf43044c0e02
Former-commit-id: a4576aeb2394fe1c8f599079c2dd3fa4576aeb2394fe1c8f599079c2dd3f2c9e5d68fa9079c2dd3f2c9e5d68fa9cea52c3bd5aed64be976580901b03ad30a7fb6a7138f2a20f
2013-01-05 10:40:10 -06:00
Bryan Kowal
95c7ef5aa6
Issue #1373 - the edexServiceList script will now be packaged in the edex-base and the datadelivery rpms
...
Former-commit-id: 09fe6a9c032d9e54ddf89062ed93d709fe6a9c032d9e54ddf89062ed93d7e131b5bc729062ed93d7e131b5bc722cb595f8bbce21e23e528a4bc85badd2cd60bb5ca14d25ded0
2013-01-04 12:50:37 -06:00
Richard Peter
7aaec36c1f
Issue #1373 : Update jvm startup to load a service list for services to start.
...
Former-commit-id: f941605942af5b6162821c560f5013f941605942af5b6162821c560f5013c1765f776c1c560f5013c1765f776c38c6856d3c9f991104dd424cb12ef66fd64a20fae8d1469a70
2013-01-03 16:27:32 -06:00
Richard Peter
a78970da48
Merge "Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly." into development
...
Former-commit-id: 218b69a387314bcffd15c3e9f40479218b69a387314bcffd15c3e9f4047945f901c1b0c3e9f4047945f901c1b038ae6f7f0aa608ba1a8854778e74907c4641be8ecec63c30c7
2012-12-18 13:08:40 -06:00
Roger Ferrel
c0e1ddbbea
Issue #1411 Corrections to pqact.con.template and fix in palt.c to handle data patterns properly.
...
Change-Id: I1f9f5b25d833c14031b9eb257c175de81bc146dc
Former-commit-id: ecec7603df8c4e70fa9a0c5d10e66aecec7603df8c4e70fa9a0c5d10e66a43fd607a300c5d10e66a43fd607a3050d3a97bcc07fbeb29286d4946290f95e6d9e7527143fb78dd
2012-12-18 09:00:46 -06:00
Bryan Kowal
15db8f220d
Issue #1416 : added the python package shapely
...
- shapely and dependencies will now be built as part of the
32-bit build and the 64-bit build from source
- shapely will also be included as part of the AWIPS II
MSFT Windows environment
Former-commit-id: efe8f338b0ef0b12813d8d1e29448aefe8f338b0ef0b12813d8d1e29448a5e22c246578d1e29448a5e22c24657f8df1139b2976834171e6103e7c485bf96e5cf59f48df7de50
2012-12-17 15:27:43 -06:00
Bryan Kowal
8b97e53cd3
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
- Updated build-notification.sh for compatibility with automated builds
Change-Id: I4d014e64a014010caa6a89e17ff3edb44000d396
Former-commit-id: 8d50e956437fb4e993e6660a9b615f8d50e956437fb4e993e6660a9b615ff39489c44c660a9b615ff39489c44c10960c5d628579adf932c44c4bd061f2569557767e19ae6378
2012-12-16 21:40:26 -06:00
Richard Peter
f0aa37e7e3
Revert "Issue #1262:"
...
This reverts commit 1b76ff615995a0a4664f83e1f8cc0a333e7ab7d4bad53d1b7f949065210309702591142f31d21ac3c3da463f39a210f08acc2f31d21ac3c3da463f39a210f08acc0970259114a210f08acc80a95c53ba9d03a53fb59a7cfa238380a95c53ba9d03a53fb59a7cfa2383f37f9484569a7cfa2383f37f948456785b6c7bfe2100b136a948641ca26f463f7c5d9b5faf3a22bd
2012-12-16 20:37:21 -06:00
Bryan Kowal
1b76ff6159
Issue #1262 :
...
- We will now be building a 64-bit version of the awips2-notification rpm
- Updated qpid-devel in nativeLib to match the version of qpid we are using
- Added 64-bit libraries to thrift and qpid in nativeLib
- The notification executables are now built from source out of nativeLib
Former-commit-id: 2f31d21ac3c3da463f39a210f08acc2f31d21ac3c3da463f39a210f08acc0970259114a210f08acc0970259114333e7ab7d4bad53d1b7f949065210383e1f8cc0a95a0a4664f
2012-12-13 12:40:31 -06:00
Roger Ferrel
12125839a8
Issue #1411 Change suggest by Dale Morris for pqact.conf.template.
...
Change-Id: I9101cb4eab47a82f64212f457d7e0eea11479cc4
Former-commit-id: 4dfc1531726929a73900b677a5ba3d4dfc1531726929a73900b677a5ba3daefa650cdab677a5ba3daefa650cda5cd4fc444b662d51cda1f64a99d554d7a28eedfd42c5a7b343
2012-12-11 15:43:54 -06:00
Steve Harris
179755f156
Merge branch 'ss_builds' (12.12.1-12) into development
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/localization/LocalizationManager.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/observer/TafMonitorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowServiceBackupDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/WeatherElementGroupDialog.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/svcbackup/SvcBackupUtil.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/request/NcCheckRequest.java
edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnitConvertingDataSource.java
Former-commit-id: d27c5237c34d4771ee3a43ddfe98c4d27c5237c34d4771ee3a43ddfe98c4f6988eefff43ddfe98c4f6988eefff377804398bf02c1ef71d6287b32e7debcc9975c4b0a60923c4
2012-12-11 08:45:53 -06:00
Steve Harris
cedbde75e3
12.12.1-12 baseline
...
Former-commit-id: 8b74846a1b89def5cf03e8e41630e88b74846a1b89def5cf03e8e41630e86d610f8e8ae8e41630e86d610f8e8a79b0e973ef69ab975fab7bb37caa23190378beebf8a9ae24cb
2012-12-06 09:18:28 -06:00
Steve Harris
5f22640e99
12.12.1-8 baseline
...
Former-commit-id: 8790caf84e2d338b4cec19962f41ba8790caf84e2d338b4cec19962f41ba5093a7c44219962f41ba5093a7c442a45a7fe1bfff4131c2eeee06a94735ec2cdc15930b22b3c014
2012-12-06 09:02:51 -06:00
Bryan Kowal
675057fb1b
Issue #1392 - update tar directory access paths for awips2-edex-native
...
Former-commit-id: 7fd81fb13314555d54d873e0f4b2787fd81fb13314555d54d873e0f4b2786ff82d812e73e0f4b2786ff82d812e904637f0a3d7ce3f584043f888ccb8ced865ade31e1e937a0f
2012-12-05 10:15:37 -06:00
Bryan Kowal
ecaf5b86dd
Issue #1354 - the Linux CAVE thinclient and the MSFT Windows CAVE thinclient will now <b>always</b> include the same CAVE features
...
Change-Id: Ib0f1a90fc55293cff2d43d236bec93001d93e8bf
Former-commit-id: 8fe14a9a603a4ca9582dd3b455c9558fe14a9a603a4ca9582dd3b455c955f99d351995d3b455c955f99d3519957c25f7a517ae64e9ce3bb0c65323b6774d3a8f8d49f45e1901
2012-11-28 16:30:10 -06:00
Bryan Kowal
5bfa0e2fa6
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Ie4b5ef9b76ce96e21e68f40ffc194cb584a1e832
Former-commit-id: b1b627e2c2cbef9ad78db60dda550cb1b627e2c2cbef9ad78db60dda550cfe9dcaa216b60dda550cfe9dcaa216ddfb4e506cfe9a06b9b967c3c140e3dbe78374bc5ef1e97bdd
2012-11-15 10:24:38 -06:00
Bryan Kowal
cd923219f5
Issue #1318 - updated ncep database rpm specification file
...
Change-Id: Iac80537a3fcc7998f93d5a3db9e842d7eea141d9
Former-commit-id: fec5563e4912667f618099399e880efec5563e4912667f618099399e880e24074da38399399e880e24074da38343764917d61842deff133d123e08a7954534e3d0632e800a7e
2012-11-15 09:26:46 -06:00
Dustin Johnson
c6dbe1bc0c
Merge branch 'ss_builds' (12.12.1-4) into development
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/SymbolSetElement.java
Change-Id: I377f89aa76f5bdb6004f8c63b7d54209e1722a71
Former-commit-id: 069c8d4788d27bce13c2bff32bbe58069c8d4788d27bce13c2bff32bbe580d1d663f41bff32bbe580d1d663f4108fd67e94a5d5dbe27e1e25b7c312bff336432346d21c445c2
2012-11-14 14:41:57 -06:00
Steve Harris
ccb16b9b44
12.12.1-4 baseline
...
Former-commit-id: b968ab5135b91b7f0fae85130eb611b968ab5135b91b7f0fae85130eb61157578da52185130eb61157578da5214300583fc2e35a321a8c628ca9e5c6493f335c0b2c2bfc949d
2012-11-14 14:19:20 -06:00
Steve Harris
b5fd6ed2fd
Merge branch 'ss_builds' (12.12.1-3) into development
...
Former-commit-id: 1ee89387488fc896f7d4448dd1c35f1ee89387488fc896f7d4448dd1c35f00f3d51546448dd1c35f00f3d5154698670f1cc221ecd53719c8cac5291559efd9a217ae9d9985cd
2012-11-13 17:28:50 -06:00
Steve Harris
9e4dbe2640
12.12.1-2 baseline
...
Former-commit-id: 7192b19284ed809a02dba8560580f87192b19284ed809a02dba8560580f86868eb9b23a8560580f86868eb9b235365b72401111e7607cfdf89fe9bed96a4a4f3f553d74c66e7
2012-11-13 17:14:24 -06:00
Steve Harris
94cd5a1388
12.12.1-1 baseline
...
Former-commit-id: 8278cac143c2839cc86de4bd20a5158278cac143c2839cc86de4bd20a515e1498006c7e4bd20a515e1498006c73cb24c1d064f243de928214fcd3b63a5be98d6deaf59663a99
2012-11-07 12:41:20 -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: 7d0e4a6e758e69107b5a98d7beae507d0e4a6e758e69107b5a98d7beae5031d7d09c1098d7beae5031d7d09c10fe8a2a3b09e7a0f96a9abcf575966b4d9c945388931d94d1de
2012-11-01 13:36:06 -05:00
Steve Harris
ad39c3d8d3
Merge branch 'ss_builds' into development
...
Former-commit-id: eb8a05a414340ce53e22fb46bb053deb8a05a414340ce53e22fb46bb053dafb534db67fb46bb053dafb534db670084fee62be211bfc043048c0c88cde9e3bdbec26f16b46b8d
2012-10-29 12:17:12 -05:00
Steve Harris
6c48aaeda6
12.11.1-12 baseline
...
Former-commit-id: 7f6baf2e24565756567f8682e4f6ca7f6baf2e24565756567f8682e4f6ca9ff9cb8aa38682e4f6ca9ff9cb8aa389940e8fedd8b6157aab314c03e7b609f6e43195a9e1b01ad7
2012-10-29 12:15:56 -05:00
Steve Harris
c9d609908b
Merge branch 'ss_builds' (12.11.1-7) into development
...
Former-commit-id: 3a9c6123d2d42e8373c6b7406a55cc3a9c6123d2d42e8373c6b7406a55cc38b9c03f5eb7406a55cc38b9c03f5e40de07be3aae9c6d58dd9d038186d120e87549c08d94eb1e59
2012-10-23 16:43:09 -05:00
Steve Harris
056baad808
12.11.1-7 baseline
...
Former-commit-id: 59e5b55b9640a5bc1683d8ca6b900559e5b55b9640a5bc1683d8ca6b900579a5638de9d8ca6b900579a5638de9320a29466defba080b9ccfd228f0d7572085c11926badd258f
2012-10-23 16:40:50 -05:00
Steve Harris
5cd4d01a55
Merge branch 'ss_builds' (12.11.1-6) into development
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 95727755c73eff876edda7337d916095727755c73eff876edda7337d91601807100932a7337d9160180710093281db2472768486da2fd3892e4df8118a17564ba335c2a8e26f
2012-10-18 16:01:05 -05:00
Steve Harris
2d368b5b0b
12.11.1-6 baseline
...
Former-commit-id: 58cd1e90f830c786a885fba4a443a058cd1e90f830c786a885fba4a443a05c1f3cdc46fba4a443a05c1f3cdc46ae73939b028beb6fc0b808fc9f6b144f27cbb4069c597c7060
2012-10-18 15:53:01 -05:00
Steve Harris
92be4d5105
12.11.1-5 baseline
...
Former-commit-id: bb8fe6e556362d6ffaca03f3f3c36abb8fe6e556362d6ffaca03f3f3c36aa0eaf651ff03f3f3c36aa0eaf651ffdfdf01de8585ad066b70e31c1e5bbadff8d5de9c13cdd55545
2012-10-18 15:46:42 -05:00
