Steve Harris
|
a53a44d42c
|
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: 1108d28cc473cd1b6be7ec5c78e78c7b6d1ea56f
|
2013-02-14 13:55:35 -06:00 |
|
Steve Harris
|
06d0e6dd16
|
13.1.1-10 baseline
Former-commit-id: 1e337899d45617a8ee1998f2d2c86f2912668b67
|
2013-02-14 13:24:43 -06:00 |
|
Steve Harris
|
56a36af0c2
|
13.1.1-10 baseline
Former-commit-id: d5639bcdf900c60d883eb975e3062ebc55803da1
|
2013-02-14 14:11:00 -05:00 |
|
Steve Harris
|
4855183325
|
13.1.2-17 baseline
Former-commit-id: 190f96b29b2c3c9e61150f3789e9fa86e2709e8f
|
2013-02-14 10:12:02 -05:00 |
|
Steve Harris
|
6fad5da5ed
|
13.2.1-7 baseline
Former-commit-id: fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
1ce95d1df2
|
13.2.1-7 baseline
Former-commit-id: 132297ab4acf8e649e3cf9a3d54d4f4676b280be
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
d0752de66c
|
13.2.1-6 baseline
Former-commit-id: 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
b80782b081
|
13.2.1-6 baseline
Former-commit-id: 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0
|
2013-02-07 16:38:44 -05:00 |
|
Steve Harris
|
8efdef4375
|
13.1.2-16 baseline
Former-commit-id: ff1a6e936737641f85604ff89cc2903d4370bcb3
|
2013-02-06 12:01:12 -05:00 |
|
Steve Harris
|
a11ab8f26e
|
13.2.1-5 baseline
Former-commit-id: d117c677ade20193836680bc7905ba7bbf9c67b2
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
b188a5a06d
|
13.1.2-15 baseline
Former-commit-id: b944cdb125c176dfd35646d83d9a8ffacc4f412b
|
2013-02-04 16:45:07 -05:00 |
|
Steve Harris
|
b4014794de
|
13.2.1-5 baseline
Former-commit-id: 7a6958217f8b67edac937a23cb1c2ae8a89cedce
|
2013-02-04 16:36:29 -05:00 |
|
Steve Harris
|
72330a23eb
|
13.1.2-14 baseline
Former-commit-id: a671299ee53ca3582970c4ff851b9c5120b94401
|
2013-01-31 13:55:17 -05:00 |
|
Steve Harris
|
8f2e7d4437
|
13.2.1-4 baseline
Former-commit-id: d4fd198979dbc5d77a6bf836685cb658e7ac6cfe
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
b7357f4828
|
13.1.2-13 baseline
Former-commit-id: 20b078fc5b7953df9edd6792682d2f63c2de76b2
|
2013-01-31 12:10:52 -05:00 |
|
Steve Harris
|
1beb655fa0
|
13.2.1-4 baseline
Former-commit-id: 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee
|
2013-01-31 12:05:59 -05:00 |
|
Steve Harris
|
431c87fd41
|
Set branch 'master_13.2.1' to 13.2.1-3
Former-commit-id: 8955b95e1587317abef2b1ca2a15ea801acd055a
|
2013-01-24 10:20:13 -06:00 |
|
Steve Harris
|
7f6d5c832d
|
13.1.2-12 baseline
Former-commit-id: 3ec64317790e32bbd91aef3e92381ec606e727b0
|
2013-01-23 17:48:37 -05:00 |
|
Steve Harris
|
a01f56909c
|
Set branch 'master' to 12.12.1-12
Former-commit-id: 0bc0387279a73fa3175ada3a827e83b9ca2f58a4
|
2013-01-23 15:41:59 -06:00 |
|
Steve Harris
|
4d1fa0f9a0
|
13.1.2-11 baseline
Former-commit-id: 4b6ccc499be12da3a21715c22067ddab5e9df5bb
|
2013-01-23 13:48:55 -05:00 |
|
Steve Harris
|
7435527b25
|
13.2.1-3 baseline
Former-commit-id: ba03739c3528638c5383528fd64674ae5af1ed64
|
2013-01-23 11:24:17 -05:00 |
|
Steve Harris
|
83e9157df7
|
13.2.1-2 baseline
Former-commit-id: bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
9771dfae6b
|
13.2.1-1 baseline
Former-commit-id: 6831a29efca54cfde39ab6a462f76ca2ac206f49
|
2013-01-23 11:13:03 -05:00 |
|
Steve Harris
|
68dde17de2
|
13.1.2-10 baseline
Former-commit-id: 5a6d030d358519ca30fc37bf4a090a00557422a3
|
2013-01-18 10:37:25 -05:00 |
|
Steve Harris
|
0878a7ea57
|
13.1.2-9 baseline
Former-commit-id: da5b6c5b6999445b5ded541aac1bbdb46f0d322d
|
2013-01-18 10:29:52 -05:00 |
|
Steve Harris
|
e6217a17de
|
13.1.2-8 baseline
Former-commit-id: c8797ef99646b2e093ad60cb9a6ee9643405a13f
|
2013-01-11 16:19:07 -05:00 |
|
Steve Harris
|
4f86b07eb0
|
13.1.2-7 baseline
Former-commit-id: 0c4514d3be8e7dee89a2abe903b51155a2895fd4
|
2013-01-11 16:12:09 -05:00 |
|
Steve Harris
|
8e5f9e0e6c
|
13.1.2-6 baseline
Former-commit-id: 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
c0c1d56f3a
|
13.1.2-2 baseline
Former-commit-id: 221d0aaf0e19a054387134e72a76a278159bf4d0
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
e8e41630e8
|
12.12.1-12 baseline
Former-commit-id: ae5110532f5ac5c7842a5483a8e2c3dc299ae814
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
45f5150eb6
|
12.12.1-10 baseline
Former-commit-id: 07d77ee5ca986f9762ec9c3276e8320e3f363ebc
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
19962f41ba
|
12.12.1-8 baseline
Former-commit-id: 657c868c5e52717a6de00dc61892115d91ada1c4
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
85130eb611
|
12.12.1-4 baseline
Former-commit-id: 4a7e3fabdef8d948216483965c1f62e5216bf362
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
c999505fba
|
12.12.1-3 baseline
Former-commit-id: 8481c91f9918a61631198331c324c4c5a76aac0f
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
a8560580f8
|
12.12.1-2 baseline
Former-commit-id: 90019fdb91dad949f125e46de9300ccd44f6e315
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
e4bd20a515
|
12.12.1-1 baseline
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
8682e4f6ca
|
12.11.1-12 baseline
Former-commit-id: 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
e845c605e6
|
12.11.1-10 baseline
Former-commit-id: 9dd41e6322bad3e7dced1a32867d9a7f886d70cf
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
d8ca6b9005
|
12.11.1-7 baseline
Former-commit-id: 59b9a93267bcf7b82fdefc55784289f7510117d0
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
fba4a443a0
|
12.11.1-6 baseline
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
03f3f3c36a
|
12.11.1-5 baseline
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
d3497e47eb
|
12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
2d0c424713
|
12.11.1-3 baseline
Former-commit-id: 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
c12ee14e66
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
618aa3f316
|
12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
dbd73151ca
|
12.10.1-8 baseline
Former-commit-id: 8a4573f57ba9a05d26f91070346050f66d94a58d
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
b754630136
|
12.10.1-7 baseline
Former-commit-id: 161fb1c0295ff4aa3b78d06ae248255d77a4e886
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
cebe6534ae
|
12.10.1-6 baseline
Former-commit-id: b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
a96d35a1fa
|
12.10.1-5 baseline
Former-commit-id: 28dc700c3ef97a134c8871c2c52086fe7db43035
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
13adee3fe9
|
Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
Former-commit-id: f17d5e913412e959e1f950bbd8e07516508f651f
|
2012-09-17 08:18:31 -05:00 |
|