Steve Harris
|
1f98e01c57
|
13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: e26f7eb151
Former-commit-id: a40c9136fe
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
0df35cc5ec
|
13.3.1-4 baseline
Former-commit-id: 8c0b90f292 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
f14049cf3f
|
13.3.1-3 baseline
Merge branch 'master_13.3.1' of ../ss_build_transfer_copy into master_13.3.1
conflicts resolved by 'theirs' strategy (all of 13.3.1-10)
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: cf951785c8 [formerly cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: db761c0f19
Former-commit-id: 62e15dacdb
|
2013-02-25 15:54:24 -06:00 |
|
Steve Harris
|
1ba778753f
|
13.3.1-3 baseline
Former-commit-id: 6572452887 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
2a2a9e03b7
|
13.3.1-2 baseline
Former-commit-id: df6d6f598e [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
654f15be5c
|
13.3.1-1 baseline
Former-commit-id: 0563d7ac18 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
8c5659e589
|
13.2.1-8 baseline
Merge commit '1da0393' into master_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
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
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 7f2b4a8092 [formerly 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 2f7bf90856
Former-commit-id: a723531b31
|
2013-02-21 09:25:27 -05:00 |
|
Steve Harris
|
b3b56830b0
|
13.3.1-1 baseline
Former-commit-id: 71e8990021 [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
38328aed51
|
Merge branch 'master_13.2.1' into master_13.3.1
Former-commit-id: 1b631ebb9a [formerly 1b631ebb9a [formerly 8584d078529382aadd9f1eac527f89ea58808df1]]
Former-commit-id: b29c0b805f
Former-commit-id: 15e9481838
|
2013-02-18 12:39:53 -06:00 |
|
Steve Harris
|
edac913af7
|
13.2.1-8 baseline
Former-commit-id: f81b382c04 [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: 053156f02e
Former-commit-id: c6d584758f
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
7b6e374314
|
13.2.1-8 baseline
Former-commit-id: 27d88edcb9 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 535a9402a7
Former-commit-id: a68ce64f45
|
2013-02-18 09:23:06 -05:00 |
|
Steve Harris
|
7b923d1891
|
13.2.1-7 baseline
Merge branch 'master_13.2.1' into master_13.3.1
Conflicts solved with 'theirs' strategy (all of 13.2.1-7)
Conflicts:
cave/com.raytheon.uf.viz.collaboration.pointdata/com.raytheon.uf.viz.collaboration.pointdata.ecl
cave/com.raytheon.uf.viz.collaboration.product.feature/com.raytheon.uf.viz.collaboration.product.feature.ecl
cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogZoneTableDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowISCGridsAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
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
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
edexOsgi/com.raytheon.uf.common.datadelivery.registry/build.properties
edexOsgi/com.raytheon.uf.common.datadelivery.retrieval/build.properties
edexOsgi/com.raytheon.uf.edex.dat.utils/src/com/raytheon/uf/edex/dat/utils/FreezingLevel.java
ncep/gov.noaa.nws.ncep.edex.plugin.convsigmet/utility/edex_static/base/purge/convsigmetPurgeRules.xml
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: a53a44d42c [formerly a53a44d42c [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]
Former-commit-id: d9028f55d3
Former-commit-id: 5bf55de767
|
2013-02-14 13:55:35 -06:00 |
|
Steve Harris
|
ba12b38550
|
13.1.1-10 baseline
Former-commit-id: 06d0e6dd16 [formerly 06d0e6dd16 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]
Former-commit-id: 9b73b6a2a9
Former-commit-id: c8c783f128
|
2013-02-14 13:24:43 -06:00 |
|
Steve Harris
|
e0dc0fbfcc
|
13.1.1-10 baseline
Former-commit-id: 56a36af0c2 [formerly 56a36af0c2 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]
Former-commit-id: 986c332e69
Former-commit-id: fa962f98a4
|
2013-02-14 14:11:00 -05:00 |
|
Steve Harris
|
94dd16659a
|
13.2.1-7 baseline
Former-commit-id: 6fad5da5ed [formerly 6fad5da5ed [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 6bfbfc8a5e
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
4c0a8e0106
|
13.2.1-7 baseline
Former-commit-id: 1ce95d1df2 [formerly 1ce95d1df2 [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]
Former-commit-id: c86246ab4d
Former-commit-id: 37be2e3f23
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
0c128dd8f0
|
13.2.1-6 baseline
Former-commit-id: d0752de66c [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
16b7b742be
|
13.2.1-6 baseline
Former-commit-id: b80782b081 [formerly b80782b081 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]
Former-commit-id: 53adfb7345
Former-commit-id: dee1480773
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
62edcd29eb
|
13.2.1-5 baseline
Former-commit-id: a11ab8f26e [formerly a11ab8f26e [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: d26a488ee4
Former-commit-id: 4a745c9483
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
256b596d88
|
13.2.1-5 baseline
Former-commit-id: b4014794de [formerly b4014794de [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]
Former-commit-id: f99f99e2f5
Former-commit-id: 418d8ca0d8
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
0a4ef8c084
|
13.2.1-4 baseline
Former-commit-id: 8f2e7d4437 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 2998f750f4
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
0c67e2153f
|
13.2.1-4 baseline
Former-commit-id: 1beb655fa0 [formerly 1beb655fa0 [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: e6e4de6247
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
89d956228c
|
Set branch 'master_13.2.1' to 13.2.1-3
Former-commit-id: 431c87fd41 [formerly 431c87fd41 [formerly 8955b95e1587317abef2b1ca2a15ea801acd055a]]
Former-commit-id: 6970a8ab46
Former-commit-id: c1ec7ca271
|
2013-01-24 10:20:13 -06:00 |
|
Steve Harris
|
bb7e40e57e
|
Set branch 'master' to 12.12.1-12
Former-commit-id: a01f56909c [formerly a01f56909c [formerly 0bc0387279a73fa3175ada3a827e83b9ca2f58a4]]
Former-commit-id: 71694006b1
Former-commit-id: 610b9dc2d8
|
2013-01-23 15:41:59 -06:00 |
|
Steve Harris
|
082e66584a
|
13.2.1-3 baseline
Former-commit-id: 7435527b25 [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 2b6ac028bd
Former-commit-id: cc0fdef15c
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
547c1dedd1
|
13.2.1-2 baseline
Former-commit-id: 83e9157df7 [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
9146e727f9
|
13.2.1-1 baseline
Former-commit-id: 9771dfae6b [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
5c488932d9
|
13.1.2-10 baseline
Former-commit-id: 68dde17de2 [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]
Former-commit-id: 86ea0b666e
Former-commit-id: d148beb4ca
|
2013-01-18 10:37:25 -05:00 |
|
Steve Harris
|
3f93a9eb2e
|
13.1.2-9 baseline
Former-commit-id: 0878a7ea57 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]
Former-commit-id: ddc6aec013
Former-commit-id: 5e0a9a8fd2
|
2013-01-18 10:29:52 -05:00 |
|
Steve Harris
|
066c14dcd2
|
13.1.2-8 baseline
Former-commit-id: e6217a17de [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 3caf592e83
|
2013-01-11 16:19:07 -05:00 |
|
Steve Harris
|
775a338b90
|
13.1.2-7 baseline
Former-commit-id: 4f86b07eb0 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 42189b5f88
Former-commit-id: b7f1dbe72b
|
2013-01-11 16:12:09 -05:00 |
|
Steve Harris
|
05bdc0ecd2
|
13.1.2-6 baseline
Former-commit-id: 8e5f9e0e6c [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 59969775ad
Former-commit-id: dbcae57f57
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
b6fa9b4858
|
13.1.2-2 baseline
Former-commit-id: c0c1d56f3a [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: 4ba416aeb3
Former-commit-id: 941337c553
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
190378beeb
|
12.12.1-12 baseline
Former-commit-id: e8e41630e8 [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 7bb37caa23
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
8ada406bfe
|
12.12.1-10 baseline
Former-commit-id: 45f5150eb6 [formerly 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]
Former-commit-id: 28018b8d9b
Former-commit-id: 0c67cb78a3
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
ec2cdc1593
|
12.12.1-8 baseline
Former-commit-id: 19962f41ba [formerly 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]
Former-commit-id: 5093a7c442
Former-commit-id: ee06a94735
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
493f335c0b
|
12.12.1-4 baseline
Former-commit-id: 85130eb611 [formerly 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]
Former-commit-id: 57578da521
Former-commit-id: 628ca9e5c6
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
314495dc8e
|
12.12.1-3 baseline
Former-commit-id: c999505fba [formerly c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2797cbcdd0
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
96a4a4f3f5
|
12.12.1-2 baseline
Former-commit-id: a8560580f8 [formerly a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]
Former-commit-id: 6868eb9b23
Former-commit-id: df89fe9bed
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
a5be98d6de
|
12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e1498006c7
Former-commit-id: 214fcd3b63
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
09f6e43195
|
12.11.1-12 baseline
Former-commit-id: 8682e4f6ca [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 314c03e7b6
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
19c4526e61
|
12.11.1-10 baseline
Former-commit-id: e845c605e6 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: 0ba69044a2
Former-commit-id: cc21977c35
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
572085c119
|
12.11.1-7 baseline
Former-commit-id: d8ca6b9005 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: 79a5638de9
Former-commit-id: cfd228f0d7
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
4f27cbb406
|
12.11.1-6 baseline
Former-commit-id: fba4a443a0 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 08fc9f6b14
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
dff8d5de9c
|
12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: a0eaf651ff
Former-commit-id: e31c1e5bba
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
560f0d9cc3
|
12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: 6958b861f0
Former-commit-id: cbbdb231ce
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
bf1f88482b
|
12.11.1-3 baseline
Former-commit-id: 2d0c424713 [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 5d796f775c
Former-commit-id: 5723fb0031
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
e72b6d5da6
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: c12ee14e66 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: 1e02387ff1
Former-commit-id: 42bf60b2fc
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
a544be6d83
|
12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: feec28f274
Former-commit-id: 8843ffd022
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
57d4eacbb5
|
12.10.1-8 baseline
Former-commit-id: dbd73151ca [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]
Former-commit-id: 73d29311d0
Former-commit-id: 94137c6ba1
|
2012-09-25 10:26:58 -05:00 |
|