Steve Harris
|
bc9df0a8f9
|
13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: f97d78994b
|
2013-03-18 15:43:32 -05:00 |
|
Steve Harris
|
97d2f521e4
|
13.3.1-7 baseline
Former-commit-id: e12ed113ae [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]
Former-commit-id: a72254cc75
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
6d96471b9b
|
13.3.1-6.1 baseline
Former-commit-id: a062803c8c [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]
Former-commit-id: fa9d260c2b
|
2013-03-13 08:28:26 -05:00 |
|
Steve Harris
|
2e110bd151
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 3a4c7931e1
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
8123d5ac45
|
13.3.1-5 baseline
Former-commit-id: e26f7eb151 [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]
Former-commit-id: a89221c75b
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
d79303de13
|
13.3.1-4 baseline
Former-commit-id: 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]
Former-commit-id: 8c0b90f292
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
07167ec04f
|
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: db761c0f19 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]
Former-commit-id: cf951785c8
|
2013-02-25 15:54:24 -06:00 |
|
Steve Harris
|
a55f438dd8
|
13.3.1-3 baseline
Former-commit-id: 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]
Former-commit-id: 6572452887
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
3e60b23072
|
13.3.1-2 baseline
Former-commit-id: 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]
Former-commit-id: df6d6f598e
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
96768407a5
|
13.3.1-1 baseline
Former-commit-id: cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]
Former-commit-id: 0563d7ac18
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
f5bd250026
|
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: 2f7bf90856 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]
Former-commit-id: 7f2b4a8092
|
2013-02-21 09:25:27 -05:00 |
|
Steve Harris
|
8ae397085e
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]
Former-commit-id: 71e8990021
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
bbc1b6fb55
|
Merge branch 'master_13.2.1' into master_13.3.1
Former-commit-id: b29c0b805f [formerly 8584d078529382aadd9f1eac527f89ea58808df1]
Former-commit-id: 1b631ebb9a
|
2013-02-18 12:39:53 -06:00 |
|
Steve Harris
|
18da2e93d7
|
13.2.1-8 baseline
Former-commit-id: 053156f02e [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]
Former-commit-id: f81b382c04
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
da707ff25c
|
13.2.1-8 baseline
Former-commit-id: 535a9402a7 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]
Former-commit-id: 27d88edcb9
|
2013-02-18 09:23:06 -05:00 |
|
Steve Harris
|
a67564bea7
|
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: d9028f55d3 [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]
Former-commit-id: a53a44d42c
|
2013-02-14 13:55:35 -06:00 |
|
Steve Harris
|
baa5de2147
|
13.1.1-10 baseline
Former-commit-id: 9b73b6a2a9 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]
Former-commit-id: 06d0e6dd16
|
2013-02-14 13:24:43 -06:00 |
|
Steve Harris
|
eff75cc712
|
13.1.1-10 baseline
Former-commit-id: 986c332e69 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]
Former-commit-id: 56a36af0c2
|
2013-02-14 14:11:00 -05:00 |
|
Steve Harris
|
0b7287b130
|
13.2.1-7 baseline
Former-commit-id: 9c23bf6e73 [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]
Former-commit-id: 6fad5da5ed
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
370b2558f0
|
13.2.1-7 baseline
Former-commit-id: c86246ab4d [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]
Former-commit-id: 1ce95d1df2
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
d66ad2f77b
|
13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]
Former-commit-id: d0752de66c
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
cc48fa4fc6
|
13.2.1-6 baseline
Former-commit-id: 53adfb7345 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]
Former-commit-id: b80782b081
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
d6a9d68c10
|
13.2.1-5 baseline
Former-commit-id: d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]
Former-commit-id: a11ab8f26e
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
1a74d2f0c5
|
13.2.1-5 baseline
Former-commit-id: f99f99e2f5 [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]
Former-commit-id: b4014794de
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
ae2859d5a2
|
13.2.1-4 baseline
Former-commit-id: 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]
Former-commit-id: 8f2e7d4437
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
f2b28cfa56
|
13.2.1-4 baseline
Former-commit-id: 1e77a6f0bd [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]
Former-commit-id: 1beb655fa0
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
34af4107ec
|
Set branch 'master_13.2.1' to 13.2.1-3
Former-commit-id: 6970a8ab46 [formerly 8955b95e1587317abef2b1ca2a15ea801acd055a]
Former-commit-id: 431c87fd41
|
2013-01-24 10:20:13 -06:00 |
|
Steve Harris
|
bfd5c7f19c
|
Set branch 'master' to 12.12.1-12
Former-commit-id: 71694006b1 [formerly 0bc0387279a73fa3175ada3a827e83b9ca2f58a4]
Former-commit-id: a01f56909c
|
2013-01-23 15:41:59 -06:00 |
|
Steve Harris
|
a5a0da5c02
|
13.2.1-3 baseline
Former-commit-id: 2b6ac028bd [formerly ba03739c3528638c5383528fd64674ae5af1ed64]
Former-commit-id: 7435527b25
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
33bc5fd816
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]
Former-commit-id: 83e9157df7
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
48d1aa7732
|
13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]
Former-commit-id: 9771dfae6b
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
683193255d
|
13.1.2-10 baseline
Former-commit-id: 86ea0b666e [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]
Former-commit-id: 68dde17de2
|
2013-01-18 10:37:25 -05:00 |
|
Steve Harris
|
6fd587d08d
|
13.1.2-9 baseline
Former-commit-id: ddc6aec013 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]
Former-commit-id: 0878a7ea57
|
2013-01-18 10:29:52 -05:00 |
|
Steve Harris
|
b864fdc303
|
13.1.2-8 baseline
Former-commit-id: 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]
Former-commit-id: e6217a17de
|
2013-01-11 16:19:07 -05:00 |
|
Steve Harris
|
a8d90da9c0
|
13.1.2-7 baseline
Former-commit-id: 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]
Former-commit-id: 4f86b07eb0
|
2013-01-11 16:12:09 -05:00 |
|
Steve Harris
|
efd3392abe
|
13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]
Former-commit-id: 8e5f9e0e6c
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
51208e5515
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]
Former-commit-id: c0c1d56f3a
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
89def5cf03
|
12.12.1-12 baseline
Former-commit-id: 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]
Former-commit-id: e8e41630e8
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
c7ec50d4f9
|
12.12.1-10 baseline
Former-commit-id: 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]
Former-commit-id: 45f5150eb6
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
2d338b4cec
|
12.12.1-8 baseline
Former-commit-id: 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]
Former-commit-id: 19962f41ba
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
b91b7f0fae
|
12.12.1-4 baseline
Former-commit-id: 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 85130eb611
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
a81c46987b
|
12.12.1-3 baseline
Former-commit-id: b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: c999505fba
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
ed809a02db
|
12.12.1-2 baseline
Former-commit-id: 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]
Former-commit-id: a8560580f8
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
c2839cc86d
|
12.12.1-1 baseline
Former-commit-id: e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e4bd20a515
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
565756567f
|
12.11.1-12 baseline
Former-commit-id: 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]
Former-commit-id: 8682e4f6ca
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
63dddc5f5f
|
12.11.1-10 baseline
Former-commit-id: 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]
Former-commit-id: e845c605e6
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
40a5bc1683
|
12.11.1-7 baseline
Former-commit-id: 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]
Former-commit-id: d8ca6b9005
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
30c786a885
|
12.11.1-6 baseline
Former-commit-id: 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]
Former-commit-id: fba4a443a0
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
362d6ffaca
|
12.11.1-5 baseline
Former-commit-id: a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: 03f3f3c36a
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
98171b5de9
|
12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: d3497e47eb
|
2012-10-16 13:27:07 -05:00 |
|