Steve Harris
|
69d88d9067
|
13.2.1-14 baseline
Former-commit-id: af22cfad98 [formerly 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]
Former-commit-id: 00ce32ea21
Former-commit-id: 5584a04cbd
|
2013-03-18 12:46:46 -04:00 |
|
Steve Harris
|
23faf84455
|
13.3.1-7 baseline
Former-commit-id: e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: a72254cc75
Former-commit-id: 97d2f521e4
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
3ea50babf5
|
13.3.1-6.1 baseline
Former-commit-id: a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: fa9d260c2b
Former-commit-id: 6d96471b9b
|
2013-03-13 08:28:26 -05:00 |
|
Steve Harris
|
4eef6862d6
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
301e4186db
|
13.2.1-13 baseline
Former-commit-id: 94fa707724 [formerly 088e318fda [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]]
Former-commit-id: 088e318fda
Former-commit-id: 7f54c8ce19
|
2013-03-11 11:55:20 -04:00 |
|
Steve Harris
|
719b5f8ef7
|
13.2.1-12 baseline
Former-commit-id: de136aad72 [formerly 23a41ad607 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]]
Former-commit-id: 23a41ad607
Former-commit-id: 1e9f9af89c
|
2013-03-07 13:43:04 -05:00 |
|
Steve Harris
|
e4a1c61ad5
|
13.3.1-5 baseline
Former-commit-id: e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
9066d511fe
|
13.3.1-4 baseline
Former-commit-id: 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
5acc4265ae
|
13.2.1-11 baseline
Former-commit-id: 0684d77845 [formerly 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]
Former-commit-id: 41dc7c0396
Former-commit-id: 0fa57eeaf2
|
2013-03-04 17:34:39 -05:00 |
|
Steve Harris
|
786642589b
|
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 cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: cf951785c8
Former-commit-id: 07167ec04f
|
2013-02-25 15:54:24 -06:00 |
|
Steve Harris
|
4a0eea00b5
|
13.3.1-3 baseline
Former-commit-id: 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 6572452887
Former-commit-id: a55f438dd8
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
0b3acc0130
|
13.3.1-2 baseline
Former-commit-id: 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: df6d6f598e
Former-commit-id: 3e60b23072
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
a08b994afd
|
13.2.1-10 baseline
Former-commit-id: acf2f8ff92 [formerly 48ebd10390 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]]
Former-commit-id: 48ebd10390
Former-commit-id: 317c81a797
|
2013-02-25 10:11:00 -05:00 |
|
Steve Harris
|
9bdd52a626
|
13.3.1-1 baseline
Former-commit-id: cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: 0563d7ac18
Former-commit-id: 96768407a5
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
f55ea02607
|
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 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 7f2b4a8092
Former-commit-id: f5bd250026
|
2013-02-21 09:25:27 -05:00 |
|
Steve Harris
|
e0406d3183
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
|
2013-02-20 16:19:40 -06:00 |
|
Steve Harris
|
df8b1abefa
|
13.2.1-9 baseline
Former-commit-id: d6dc4694f0 [formerly a339cfb704 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]]
Former-commit-id: a339cfb704
Former-commit-id: 2dc4a4f50f
|
2013-02-20 14:11:20 -05:00 |
|
Steve Harris
|
af78b95ef2
|
Merge branch 'master_13.2.1' into master_13.3.1
Former-commit-id: b29c0b805f [formerly 1b631ebb9a [formerly 8584d078529382aadd9f1eac527f89ea58808df1]]
Former-commit-id: 1b631ebb9a
Former-commit-id: bbc1b6fb55
|
2013-02-18 12:39:53 -06:00 |
|
Steve Harris
|
d176ec1f38
|
13.2.1-8 baseline
Former-commit-id: 053156f02e [formerly f81b382c04 [formerly f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669]]
Former-commit-id: f81b382c04
Former-commit-id: 18da2e93d7
|
2013-02-18 09:09:41 -06:00 |
|
Steve Harris
|
1af911d098
|
13.2.1-8 baseline
Former-commit-id: 535a9402a7 [formerly 27d88edcb9 [formerly 1da0393f24829256c090d06ea8f7a0eca5e68bfd]]
Former-commit-id: 27d88edcb9
Former-commit-id: da707ff25c
|
2013-02-18 09:23:06 -05:00 |
|
Steve Harris
|
831991e5e6
|
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 a53a44d42c [formerly 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f]]
Former-commit-id: a53a44d42c
Former-commit-id: a67564bea7
|
2013-02-14 13:55:35 -06:00 |
|
Steve Harris
|
99a9726284
|
13.1.1-10 baseline
Former-commit-id: 9b73b6a2a9 [formerly 06d0e6dd16 [formerly 1e337899d45617a8ee1998f2d2c86f2912668b67]]
Former-commit-id: 06d0e6dd16
Former-commit-id: baa5de2147
|
2013-02-14 13:24:43 -06:00 |
|
Steve Harris
|
09fe656bcc
|
13.1.1-10 baseline
Former-commit-id: 986c332e69 [formerly 56a36af0c2 [formerly d5639bcdf900c60d883eb975e3062ebc55803da1]]
Former-commit-id: 56a36af0c2
Former-commit-id: eff75cc712
|
2013-02-14 14:11:00 -05:00 |
|
Steve Harris
|
e2358ae19b
|
13.1.2-17 baseline
Former-commit-id: 01c544953e [formerly 4855183325 [formerly 190f96b29b2c3c9e61150f3789e9fa86e2709e8f]]
Former-commit-id: 4855183325
Former-commit-id: 4ae6bd9716
|
2013-02-14 10:12:02 -05:00 |
|
Steve Harris
|
934a76bd7e
|
13.2.1-7 baseline
Former-commit-id: 9c23bf6e73 [formerly 6fad5da5ed [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 6fad5da5ed
Former-commit-id: 0b7287b130
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
c0b56ae597
|
13.2.1-7 baseline
Former-commit-id: c86246ab4d [formerly 1ce95d1df2 [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]
Former-commit-id: 1ce95d1df2
Former-commit-id: 370b2558f0
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
52f48669f6
|
13.2.1-6 baseline
Former-commit-id: a46e33f06e [formerly d0752de66c [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: d0752de66c
Former-commit-id: d66ad2f77b
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
9b7251d17e
|
13.2.1-6 baseline
Former-commit-id: 53adfb7345 [formerly b80782b081 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]
Former-commit-id: b80782b081
Former-commit-id: cc48fa4fc6
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
43aef0d4b2
|
13.1.2-16 baseline
Former-commit-id: fbe89b68ce [formerly 8efdef4375 [formerly ff1a6e936737641f85604ff89cc2903d4370bcb3]]
Former-commit-id: 8efdef4375
Former-commit-id: f38b23a34b
|
2013-02-06 12:01:12 -05:00 |
|
Steve Harris
|
e2b47a728a
|
13.2.1-5 baseline
Former-commit-id: d26a488ee4 [formerly a11ab8f26e [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: a11ab8f26e
Former-commit-id: d6a9d68c10
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
a92e6b272e
|
13.1.2-15 baseline
Former-commit-id: 986bf8029e [formerly b188a5a06d [formerly b944cdb125c176dfd35646d83d9a8ffacc4f412b]]
Former-commit-id: b188a5a06d
Former-commit-id: bfd89f7971
|
2013-02-04 16:45:07 -05:00 |
|
Steve Harris
|
05c2ca86f4
|
13.2.1-5 baseline
Former-commit-id: f99f99e2f5 [formerly b4014794de [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]
Former-commit-id: b4014794de
Former-commit-id: 1a74d2f0c5
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
bfa80715f0
|
13.1.2-14 baseline
Former-commit-id: fe21144920 [formerly 72330a23eb [formerly a671299ee53ca3582970c4ff851b9c5120b94401]]
Former-commit-id: 72330a23eb
Former-commit-id: 45794f7232
|
2013-01-31 13:55:17 -05:00 |
|
Steve Harris
|
ed224fde88
|
13.2.1-4 baseline
Former-commit-id: 0d7f53b6f4 [formerly 8f2e7d4437 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 8f2e7d4437
Former-commit-id: ae2859d5a2
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
bdd9a0e866
|
13.1.2-13 baseline
Former-commit-id: 93063d4849 [formerly b7357f4828 [formerly 20b078fc5b7953df9edd6792682d2f63c2de76b2]]
Former-commit-id: b7357f4828
Former-commit-id: b2ee20b4ec
|
2013-01-31 12:10:52 -05:00 |
|
Steve Harris
|
5acf001c1b
|
13.2.1-4 baseline
Former-commit-id: 1e77a6f0bd [formerly 1beb655fa0 [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1beb655fa0
Former-commit-id: f2b28cfa56
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
98955073fe
|
Set branch 'master_13.2.1' to 13.2.1-3
Former-commit-id: 6970a8ab46 [formerly 431c87fd41 [formerly 8955b95e1587317abef2b1ca2a15ea801acd055a]]
Former-commit-id: 431c87fd41
Former-commit-id: 34af4107ec
|
2013-01-24 10:20:13 -06:00 |
|
Steve Harris
|
5bbe2114d1
|
13.1.2-12 baseline
Former-commit-id: c8405cf1d9 [formerly 7f6d5c832d [formerly 3ec64317790e32bbd91aef3e92381ec606e727b0]]
Former-commit-id: 7f6d5c832d
Former-commit-id: 350ee39799
|
2013-01-23 17:48:37 -05:00 |
|
Steve Harris
|
fad158bc97
|
Set branch 'master' to 12.12.1-12
Former-commit-id: 71694006b1 [formerly a01f56909c [formerly 0bc0387279a73fa3175ada3a827e83b9ca2f58a4]]
Former-commit-id: a01f56909c
Former-commit-id: bfd5c7f19c
|
2013-01-23 15:41:59 -06:00 |
|
Steve Harris
|
a7442a7b92
|
13.1.2-11 baseline
Former-commit-id: c0975104b0 [formerly 4d1fa0f9a0 [formerly 4b6ccc499be12da3a21715c22067ddab5e9df5bb]]
Former-commit-id: 4d1fa0f9a0
Former-commit-id: 6332f57e00
|
2013-01-23 13:48:55 -05:00 |
|
Steve Harris
|
7d2e979c51
|
13.2.1-3 baseline
Former-commit-id: 2b6ac028bd [formerly 7435527b25 [formerly ba03739c3528638c5383528fd64674ae5af1ed64]]
Former-commit-id: 7435527b25
Former-commit-id: a5a0da5c02
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
a4fa438a41
|
13.2.1-2 baseline
Former-commit-id: 328c6dccad [formerly 83e9157df7 [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 83e9157df7
Former-commit-id: 33bc5fd816
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
11b05eedeb
|
13.2.1-1 baseline
Former-commit-id: c63f9bcae0 [formerly 9771dfae6b [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: 9771dfae6b
Former-commit-id: 48d1aa7732
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
5b617e763b
|
13.1.2-10 baseline
Former-commit-id: 86ea0b666e [formerly 68dde17de2 [formerly 5a6d030d358519ca30fc37bf4a090a00557422a3]]
Former-commit-id: 68dde17de2
Former-commit-id: 683193255d
|
2013-01-18 10:37:25 -05:00 |
|
Steve Harris
|
a78d3ab456
|
13.1.2-9 baseline
Former-commit-id: ddc6aec013 [formerly 0878a7ea57 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]
Former-commit-id: 0878a7ea57
Former-commit-id: 6fd587d08d
|
2013-01-18 10:29:52 -05:00 |
|
Steve Harris
|
5aaacf4eec
|
13.1.2-8 baseline
Former-commit-id: 06b8eb8db0 [formerly e6217a17de [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]
Former-commit-id: e6217a17de
Former-commit-id: b864fdc303
|
2013-01-11 16:19:07 -05:00 |
|
Steve Harris
|
0b15dff12b
|
13.1.2-7 baseline
Former-commit-id: 42189b5f88 [formerly 4f86b07eb0 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]
Former-commit-id: 4f86b07eb0
Former-commit-id: a8d90da9c0
|
2013-01-11 16:12:09 -05:00 |
|
Steve Harris
|
1d4d25b49b
|
13.1.2-6 baseline
Former-commit-id: 59969775ad [formerly 8e5f9e0e6c [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]
Former-commit-id: 8e5f9e0e6c
Former-commit-id: efd3392abe
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
e8f4a2f031
|
13.1.2-2 baseline
Former-commit-id: 4ba416aeb3 [formerly c0c1d56f3a [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]
Former-commit-id: c0c1d56f3a
Former-commit-id: 51208e5515
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
8b74846a1b
|
12.12.1-12 baseline
Former-commit-id: 6d610f8e8a [formerly e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]
Former-commit-id: e8e41630e8
Former-commit-id: 89def5cf03
|
2012-12-06 09:18:28 -06:00 |
|