xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2862 commits 31 branches 40 tags 3.8 GiB
Commit graph

87 commits

Author SHA1 Message Date
Matt Nash
c61b9d95e5 Issue #1996 remove tear offs from GFE by adding a field to enable by perspective 
Change-Id: I92d0138637b95c86a8326878756c720a97586fb1

Former-commit-id: 7d61737d79 [formerly 7895dfa2e4] [formerly cb59b82add [formerly 7666c93bd833f935c6b1635adeb385c2fa4e04cc]]
Former-commit-id: cb59b82add
Former-commit-id: 5d492a4b10
 2013-06-03 09:58:43 -05:00
Nate Jensen
f7817d7c41 Issue #1967 fix annoying warnings, remove unused preferences page 
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: bd8431b986 [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]
Former-commit-id: 3f85aeb00a
Former-commit-id: 0b48f54f47
 2013-05-28 14:30:26 -05:00
Max Schenkelberg
aca7e67133 Issue #1638 Moved common map actions to core.maps from d2d 
Change-Id: I1a41dc0ec41ea97172a5513b3018f22aa2f6879c

Former-commit-id: 82b7e03b10 [formerly 2592dafc5d] [formerly 0ad6f8a594 [formerly eacca79223be9b743e97ecfe00813f1d529a05de]]
Former-commit-id: 0ad6f8a594
Former-commit-id: 7e84441327
 2013-04-25 16:02:02 -05:00
Max Schenkelberg
8d1b555c39 Issue #1638 Made Map scales more generalized for use outside of D2D 
Amend: Added generalization to JaxbManager

Change-Id: Ic210b8b0d50b4f362321855268570147c439cc2a

Former-commit-id: dabffdbf79 [formerly fd375314cd] [formerly e17d691400 [formerly 1e5812d9796a77559d70392be18619a8f7316f2d]]
Former-commit-id: e17d691400
Former-commit-id: 36e80c267e
 2013-03-25 15:38:36 -05:00
Max Schenkelberg
850c8995cc Issue #1638 renamed class to removed non-existent Map dependency on uf.viz.core.rsc project. Made MapScales non-d2d specific. Made gisdatastore not depend on gfe. 
Amend: Moved Pair class into uf.common.util to reduce amount of duplicate code
Amend: Added hashCode/equals to Pair

Change-Id: I9a390989f6a7a7ee6618a57d0f50ec681a598dc0

Former-commit-id: 07ae94c499 [formerly ea26d0de84] [formerly 126be0cfe5 [formerly eb1dd65cfdcd50b450174a1ca4ef2f2d1e1b9bae]]
Former-commit-id: 126be0cfe5
Former-commit-id: d20958ae92
 2013-03-22 10:54:44 -05:00
Max Schenkelberg
ec27a16858 Issue #1638 Adding pointdata as common base plugin, adding edex pointdata to edex base plugin. Removed edex pointdata dependency on uengine. Removed unused class RequestJob. Cleaned up manifest dependencies in CAVE. 
Change-Id: I177804512c34603bae0027edfa420de47d23138e

Former-commit-id: 43341e7ad3 [formerly c6db3ce43b] [formerly 26cfcd2af5 [formerly d9cc808839d4a3210381329eec4f73e061be9968]]
Former-commit-id: 26cfcd2af5
Former-commit-id: 2e10fd83f6
 2013-03-20 14:10:52 -05:00
Steve Harris
2a26783ba7 Merge branch 'omaha_13.3.1' into development 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ZoneCombinerComp.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscUtil.py
	edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
	edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java

Former-commit-id: 28ef804e1b [formerly b8f0635ad6] [formerly 7fcf9f1cb2 [formerly 4a9b882446c68cd54a8b23a70a9b2f4f8961ca40]]
Former-commit-id: 7fcf9f1cb2
Former-commit-id: 900b9aadde
 2013-03-18 16:52:00 -05:00
Dave Hladky
9e97fc9efe Issue #1782 Merge branch master_13.3.1 into omaha_13.3.1 
Former-commit-id: 765be278bb [formerly 38b952a220] [formerly 5dc454c7ef [formerly 7b2ba6522a24b0baf1ce950c1fee3cf895ba7753]]
Former-commit-id: 5dc454c7ef
Former-commit-id: 160e1594b8
 2013-03-13 13:56:33 -05:00
Steve Harris
ed5f1dbab6 13.3.1-7 baseline 
Former-commit-id: 97d2f521e4 [formerly a72254cc75] [formerly e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: e12ed113ae
Former-commit-id: 31c0a97dca
 2013-03-13 09:50:28 -05:00
Steve Harris
4a0b8772ec Merge branch 'omaha_13.3.1' into development 
Former-commit-id: 6b13492420 [formerly d5b80f9225] [formerly aa0e9acefd [formerly dd9a3152106c5e4eac6fb2de10f27528e5177810]]
Former-commit-id: aa0e9acefd
Former-commit-id: b9563da8a8
 2013-03-05 12:29:44 -06:00
Steve Harris
b423579e4a Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1 
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
 2013-03-05 12:27:49 -06:00
Steve Harris
3e0614b43a 13.3.1-4 baseline 
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
 2013-03-05 10:39:59 -06:00
Ben Steffensmeier
334af0001b Issue #1532 Delete uf.common.image and clean up the mess it left behind. 
Former-commit-id: d27d30c2db [formerly f46686a6e2] [formerly 2ca86633d6 [formerly 7c24d10acae9dee7ec03edd471983e0b80d58092]]
Former-commit-id: 2ca86633d6
Former-commit-id: 5068b18c6a
 2013-02-28 17:00:56 -06:00
Steve Harris
4f155a183a Merge branch 'development' into omaha_13.3.1 
Conflicts:
	cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java

Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
 2013-02-21 15:41:39 -06:00
Ben Steffensmeier
894c7e7e62 Issue #1609 update style rules for msl-P contours 
Former-commit-id: 6bf304ab80 [formerly e7f73db73c] [formerly f029f74a4f [formerly 2137a2aae531d5550a59d7c5afd77a8d1fc28bc8]]
Former-commit-id: f029f74a4f
Former-commit-id: 5b9e13aa3d
 2013-02-20 17:27:16 -06:00
Steve Harris
e4435815c9 13.3.1-1 baseline 
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
 2013-02-20 16:19:40 -06:00
Steve Harris
bbe92e6824 13.2.1-6 baseline 
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
 2013-02-07 16:00:39 -06:00
Brad Gonzales
8fc5c18ebd 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: 35cc853c74 [formerly f459554e33] [formerly 5bc6dd5498 [formerly a84415dcfc5dd1d330ef8022f496b2e2ee45c54d]]
Former-commit-id: 5bc6dd5498
Former-commit-id: f3ef309293
 2013-02-04 08:52:33 -06:00
Max Schenkelberg
a1d92fa99f Issue #1558 Fixed RotatePanelsHandler so it functions correctly when rotating from 4-1 panel 
Change-Id: I39f6d119360b6c43b2ba4667321e4119d312f721

Former-commit-id: d0c9157e2a [formerly ed4a9023da] [formerly 95d3706969 [formerly b5f53d6b332c8f4b24462d0d42ff1d07cb31830b]]
Former-commit-id: 95d3706969
Former-commit-id: 0f9f51fb14
 2013-01-31 15:34:46 -06:00
Steve Harris
d9be4dce21 13.2.1-2 baseline 
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
 2013-01-23 11:18:44 -05:00
Steve Harris
8ed6a53113 13.2.1-1 baseline 
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
 2013-01-23 11:13:03 -05:00
Max Schenkelberg
410abb1144 Issue #1462 Created new BundleLoader and BundleProductLoader to consolidate code for loading Bundles to the screen asynchronously. 
Amend: Switched to proper ticket

Change-Id: Iacfc73f574aef64bba43323818ea3484b1f5a9b9

Former-commit-id: 9aac1d2871 [formerly 02e7c79de9] [formerly aa88b83859 [formerly 86aa1a7febbd1b8671e546c2b9eaca10f82860a4]]
Former-commit-id: aa88b83859
Former-commit-id: c6b6823228
 2013-01-15 14:13:36 -06:00
Richard Peter
79ef100838 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: a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
 2013-01-14 18:07:17 -06:00
Steve Harris
e34695538d 13.2.1-1 baseline 
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
 2013-01-14 18:42:21 -05:00
Steve Harris
82a1ed77a4 13.1.2-6 baseline 
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
 2013-01-06 14:55:11 -06:00
Steve Harris
cd4185ef5c 13.1.2-2 baseline 
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
 2013-01-06 14:32:24 -06:00
Steve Harris
f02c1ef71d 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: 4d4771ee3a [formerly 43ddfe98c4] [formerly f6988eefff [formerly e733dd9d05d3704f86e2a711607a1834df1a56f2]]
Former-commit-id: f6988eefff
Former-commit-id: 6287b32e7d
 2012-12-11 08:45:53 -06:00
Steve Harris
69ab975fab 12.12.1-12 baseline 
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
 2012-12-06 09:18:28 -06:00
Max Schenkelberg
f681c1304c Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins 
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: 56ae27e172 [formerly b648c5828e] [formerly ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]]
Former-commit-id: ed77d56a84
Former-commit-id: b24440cc37
 2012-11-29 10:29:36 -06:00
Steve Harris
4f243de928 12.12.1-1 baseline 
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
 2012-11-07 12:41:20 -06:00
Roger Ferrel
f253f2191b Issue #1229 Changes for non-blocking BackgroundColorDialog. 
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: ac30143335 [formerly 59a2dd6a3a] [formerly d60b4ca396 [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]]
Former-commit-id: d60b4ca396
Former-commit-id: 757affcc66
 2012-10-16 17:00:11 -05:00
Roger Ferrel
3682a16ad2 Issue #1229 Changes for non-blocking ProcedureListDlg. 
Change-Id: I5c955c9d07e104809e2a72de0f5ec998f13d797f

Former-commit-id: 1dc188fb3b [formerly 1a1f1a0601] [formerly d51ba247d1 [formerly ea4c2898013df2107ebded11aa1561035eaf8a00]]
Former-commit-id: d51ba247d1
Former-commit-id: 85f8c1f282
 2012-10-16 15:39:12 -05:00
Steve Harris
2c82d9cb07 12.11.1-4 baseline 
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
 2012-10-16 13:27:07 -05:00
Roger Ferrel
1572b42313 Issue #1229 Changes for non-blocking ProcedureDlg. 
Change-Id: Iefdf2f8e8ceeb7af5173dd4c630b6abc2c1ce41a

Former-commit-id: 185acb8d87 [formerly 683c49fc49] [formerly d9fee38d21 [formerly 207c1dfec7f51a429c9db61258d09631ef2049c9]]
Former-commit-id: d9fee38d21
Former-commit-id: f685ac224f
 2012-10-16 12:53:39 -05:00
Roger Ferrel
cad15f8b96 Issue #1229 Changes for non-blocking HistoryListDlg. 
Change-Id: Iffd288fed390121dfec770fd451c028ca78face2

Former-commit-id: 4c69b818b4 [formerly 46eafd72e7] [formerly 23db6f4981 [formerly d8c36ff080bf42da11ab4d770fd022a6e2359f4f]]
Former-commit-id: 23db6f4981
Former-commit-id: 5a6d2af7c8
 2012-10-16 11:01:07 -05:00
Roger Ferrel
83ebc25c26 Issue #1229 Changes for non-blocking AlterBundleDlg. 
Change-Id: Icea110c4ff66360e2d406a1f2966cf6851fbddc1

Former-commit-id: 7e3068734e [formerly 59f21825ae] [formerly acb0ca9c6f [formerly fa1a55648d6d98104b0861db5e45c5de73612a09]]
Former-commit-id: acb0ca9c6f
Former-commit-id: 4ea86be01d
 2012-10-16 10:28:15 -05:00
Roger Ferrel
23baab80e8 Issue #1229 Changes to non-blocking ImageBlinkDialog. 
Change-Id: Ifec323bfc7c44b928d0d135c346c3536fe7ceb96

Former-commit-id: a4cb0a13d4 [formerly b139d0fc24] [formerly 4792c77aab [formerly b6e7c9d63de65a9523448ff691db6f88f7514f52]]
Former-commit-id: 4792c77aab
Former-commit-id: 06a7728662
 2012-10-16 09:17:47 -05:00
Steve Harris
0f90866e4e Merge "Issue #1229 Changes to make non-blocking CreateProjectionDialog." into development 
Former-commit-id: 4833a4a806 [formerly 8f1c76c3f5] [formerly 0ccb08d42a [formerly ba4a18d8a7eb8cf0eae99656c48273cf5406dabf]]
Former-commit-id: 0ccb08d42a
Former-commit-id: 0931256948
 2012-10-16 09:12:20 -05:00
Roger Ferrel
ea271fa511 Issue #1229 Changes for non-blocking DisplayPropertiesDialog. 
Change-Id: If19a36fe150c85d92e85a56b931dc66ba9a251b3

Former-commit-id: a633a43f29 [formerly a495dee0c9] [formerly 566ce2d976 [formerly 3cf1be917057f6a3db71ae3b408e46ca1e972f11]]
Former-commit-id: 566ce2d976
Former-commit-id: 80c2beec21
 2012-10-16 08:02:23 -05:00
Roger Ferrel
548f7f510f Issue #1229 Changes to make non-blocking CreateProjectionDialog. 
Change-Id: Ic7150a3e0dc5fb0cf0c5f4f32c3d107b6c7f7d1c

Former-commit-id: aa3f30eec5 [formerly 96a6dc145c] [formerly a3fbfef3ce [formerly 0e5aed1eb8a1edcf0a6bce196fdbcaf65cf6bc62]]
Former-commit-id: a3fbfef3ce
Former-commit-id: 8f33c1d0a6
 2012-10-16 07:33:39 -05:00
Roger Ferrel
c1bc223001 Issue #1229 Changes for non-blocking PrintDialog. 
Change-Id: Ia47dffbc611f9214a43754b4e1f8d4c95817462b

Former-commit-id: 8533066287 [formerly b27323c29e] [formerly 059c8a4d7c [formerly c748615380d65d7a105ffd2e46cf1eba3cb035b9]]
Former-commit-id: 059c8a4d7c
Former-commit-id: a664fc8b8b
 2012-10-15 15:24:04 -05:00
Roger Ferrel
09bb914dc0 Issue #1248 Changes to allow change listeners on Alter Bundles. 
Changes from code review 2.

Change-Id: I8f8640a9c90c0191179c74570855a67370617a20

Former-commit-id: 65a19e48b0 [formerly e7d27f4aab] [formerly 03070aded9 [formerly de530f99fcc7f68a1bd84ed399ff04eac63e7a58]]
Former-commit-id: 03070aded9
Former-commit-id: f4861554cd
 2012-10-10 06:52:09 -05:00
Steven Harris
f5e63d5f93 12.11.1-1 baseline 
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
 2012-09-27 15:57:45 -05:00
Nate Jensen
720986610b Merge "Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly" into development 
Former-commit-id: 00cc58cbb5 [formerly 78169b1bf1] [formerly 6a5f700bce [formerly 9615c1149f086af6a9d8657ad4c36bcc8f5aade2]]
Former-commit-id: 6a5f700bce
Former-commit-id: 6d292c35c3
 2012-09-24 14:26:54 -05:00
Max Schenkelberg
03146b0a16 Issue #1192 Changed rename dialog to allow specifying a directory path along with the new file name. Made so directories can be attempted to be deleted as well. Cleaned up FileTreeView code so directory and file deletions show up in tree correctly 
Change-Id: I3080a03fcbed0de39908945d899e0c8200c2dc9a

Former-commit-id: 7a53736cf3 [formerly 22be9bee2e] [formerly adbeffbb25 [formerly 5397776e07902b1deb68259128ae536fafa1d844]]
Former-commit-id: adbeffbb25
Former-commit-id: ab58fcb601
 2012-09-24 11:33:03 -05:00
Ben Steffensmeier
3256de1093 Issue #1208 change density and mag handlers in d2d to not throw exceptions. 
Former-commit-id: 0bc73bb5aa [formerly f20812bc11] [formerly 3f4bfb8efe [formerly b7c0ef15d9e8c27cd3ce646b393c6c44315eabef]]
Former-commit-id: 3f4bfb8efe
Former-commit-id: 6e8bca348f
 2012-09-21 11:11:24 -05:00
Steve Harris
bc86013d8f Merge branch 'development' into Enhanced_points 
Former-commit-id: 2e47ad78bc [formerly 321e2191b1] [formerly 6146f56ce4 [formerly ee63462d73511ef55dc0d80b3e94ef08a37f3305]]
Former-commit-id: 6146f56ce4
Former-commit-id: 9ca736f901
 2012-09-13 15:25:12 -05:00
Steve Harris
e23b030dfd Merge branch 'ss_builds' (12.10.1-4) into development 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/dialogs/CurrentAlarmQueue.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: 04de1d5857 [formerly 29e7427dc3] [formerly 04d9735c8f [formerly 4b7c9ed0bdf6dc1a3a86421b502a176256d56aeb]]
Former-commit-id: 04d9735c8f
Former-commit-id: 53673f63e6
 2012-09-13 13:26:13 -05:00
Steve Harris
f641cdd4e0 12.10.1-4 baseline 
Former-commit-id: 9cd1f3ec0f [formerly 791ef6cedf] [formerly 92cc2d8605 [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 92cc2d8605
Former-commit-id: b4d2a0e8dd
 2012-09-13 12:33:36 -05:00
Steve Harris
684feb34e5 12.10.1-4 baseline 
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: 49c3861597
Former-commit-id: 2ba58a3576
 2012-09-13 12:08:11 -05:00