Steve Harris
|
f28b85d42f
|
13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]
Former-commit-id: 7bf9966dcb
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
a262f22cee
|
13.3.1-16 baseline
Former-commit-id: 3066dd33e5 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]
Former-commit-id: 51380726d4
|
2013-04-01 11:39:08 -05:00 |
|
Steve Harris
|
4cf3ad6abb
|
13.3.1-15 baseline
Former-commit-id: 3d8ed484be [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]
Former-commit-id: eb1dab3864
|
2013-04-01 11:33:20 -05:00 |
|
Steve Harris
|
88a4bb0924
|
13.2.1-19 baseline
Former-commit-id: fc859547f8 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]
Former-commit-id: bebd9ad1f4
|
2013-04-01 10:11:24 -04:00 |
|
Steve Harris
|
6a4bbd9f1a
|
13.3.1-14 baseline
Former-commit-id: 4d4234d5c9 [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]
Former-commit-id: c29076949e
|
2013-03-27 22:10:03 -05:00 |
|
Steve Harris
|
91a5e4578e
|
13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]
Former-commit-id: 9022c500ce
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
792171756f
|
13.3.1-13 baseline
Former-commit-id: c65f3e68e5 [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]
Former-commit-id: c77a452f5a
|
2013-03-26 12:43:07 -05:00 |
|
Steve Harris
|
be96282207
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: 0be473728a
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
2edab61540
|
13.3.1-11 baseline
Former-commit-id: 373d13df39 [formerly 81effd422de0285d345ebfd5c472c924ce261815]
Former-commit-id: 9cdd90e382
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
57f4676b6c
|
13.3.1-10 baseline
Former-commit-id: 7078eec1b1 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]
Former-commit-id: 073687d9a9
|
2013-03-20 15:53:01 -05:00 |
|
Steve Harris
|
97dfda9020
|
13.2.1-18 baseline
Former-commit-id: f52a716b3f [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]
Former-commit-id: 3fd5612f89
|
2013-03-20 16:46:35 -04:00 |
|
Steve Harris
|
c7b2ef2d8c
|
13.3.1-9 baseline
Former-commit-id: f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]
Former-commit-id: 468ae82305
|
2013-03-19 14:22:56 -05:00 |
|
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
|
4bb3ad8bde
|
13.2.1-17 baseline
Former-commit-id: e3e250c817 [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]
Former-commit-id: 43aa54dc4c
|
2013-03-18 13:01:37 -04:00 |
|
Steve Harris
|
1eca318fab
|
13.2.1-16 baseline
Former-commit-id: ef031e34df [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]
Former-commit-id: a75fe06bfe
|
2013-03-18 12:57:34 -04:00 |
|
Steve Harris
|
ff687e572b
|
13.2.1-15 baseline
Former-commit-id: 7617a2437f [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]
Former-commit-id: 7b52d3eb6e
|
2013-03-18 12:53:04 -04:00 |
|
Steve Harris
|
5584a04cbd
|
13.2.1-14 baseline
Former-commit-id: af22cfad98 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]
Former-commit-id: 00ce32ea21
|
2013-03-18 12:46:46 -04: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
|
7f54c8ce19
|
13.2.1-13 baseline
Former-commit-id: 94fa707724 [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]
Former-commit-id: 088e318fda
|
2013-03-11 11:55:20 -04:00 |
|
Steve Harris
|
1e9f9af89c
|
13.2.1-12 baseline
Former-commit-id: de136aad72 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]
Former-commit-id: 23a41ad607
|
2013-03-07 13:43:04 -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
|
0fa57eeaf2
|
13.2.1-11 baseline
Former-commit-id: 0684d77845 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]
Former-commit-id: 41dc7c0396
|
2013-03-04 17:34:39 -05: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
|
317c81a797
|
13.2.1-10 baseline
Former-commit-id: acf2f8ff92 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]
Former-commit-id: 48ebd10390
|
2013-02-25 10:11:00 -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
|
2dc4a4f50f
|
13.2.1-9 baseline
Former-commit-id: d6dc4694f0 [formerly 915d8edd4670b38df0474de72cf19c6d8b9aa1a3]
Former-commit-id: a339cfb704
|
2013-02-20 14:11:20 -05: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
|
4ae6bd9716
|
13.1.2-17 baseline
Former-commit-id: 01c544953e [formerly 190f96b29b2c3c9e61150f3789e9fa86e2709e8f]
Former-commit-id: 4855183325
|
2013-02-14 10:12:02 -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
|
f38b23a34b
|
13.1.2-16 baseline
Former-commit-id: fbe89b68ce [formerly ff1a6e936737641f85604ff89cc2903d4370bcb3]
Former-commit-id: 8efdef4375
|
2013-02-06 12:01:12 -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
|
bfd89f7971
|
13.1.2-15 baseline
Former-commit-id: 986bf8029e [formerly b944cdb125c176dfd35646d83d9a8ffacc4f412b]
Former-commit-id: b188a5a06d
|
2013-02-04 16:45:07 -05: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
|
45794f7232
|
13.1.2-14 baseline
Former-commit-id: fe21144920 [formerly a671299ee53ca3582970c4ff851b9c5120b94401]
Former-commit-id: 72330a23eb
|
2013-01-31 13:55:17 -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 |
|