Steve Harris
3fd5612f89
13.2.1-18 baseline
...
Former-commit-id: aaef550ed7b6715c68b755514ceb504a9a9e9453
2013-03-20 16:46:35 -04:00
Steve Harris
468ae82305
13.3.1-9 baseline
...
Former-commit-id: 17276903ed005e17165649f236e6a99afa47b7fb
2013-03-19 14:22:56 -05:00
Steve Harris
f97d78994b
13.3.1-8 baseline
...
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
2013-03-18 15:43:32 -05:00
Steve Harris
43aa54dc4c
13.2.1-17 baseline
...
Former-commit-id: 1530bd69d5e34c81edae099c0670ae3899c94d1e
2013-03-18 13:01:37 -04:00
Steve Harris
a75fe06bfe
13.2.1-16 baseline
...
Former-commit-id: e40b78e021afdc0d3775c7bd3720aee81b58133a
2013-03-18 12:57:34 -04:00
Steve Harris
7b52d3eb6e
13.2.1-15 baseline
...
Former-commit-id: a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc
2013-03-18 12:53:04 -04:00
Steve Harris
00ce32ea21
13.2.1-14 baseline
...
Former-commit-id: 101c9de4e57be6c25dab4f1e6d9158a33ca89005
2013-03-18 12:46:46 -04:00
Steve Harris
a72254cc75
13.3.1-7 baseline
...
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
2013-03-13 09:50:28 -05:00
Steve Harris
fa9d260c2b
13.3.1-6.1 baseline
...
Former-commit-id: 0ad794c98700f44b15933de48224ed2a822fd78f
2013-03-13 08:28:26 -05:00
Steve Harris
3a4c7931e1
13.3.1-6 baseline
...
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Steve Harris
088e318fda
13.2.1-13 baseline
...
Former-commit-id: 54d1ecdf86e471b984eb4a74d42d03145ae067d0
2013-03-11 11:55:20 -04:00
Steve Harris
23a41ad607
13.2.1-12 baseline
...
Former-commit-id: 6316b9db6cbf29e0038128763d2ad86b1b7abae8
2013-03-07 13:43:04 -05:00
Steve Harris
a89221c75b
13.3.1-5 baseline
...
Former-commit-id: 97fafc60d9327ab3ea3f72266113c8f5e122a275
2013-03-05 10:47:06 -06:00
Steve Harris
8c0b90f292
13.3.1-4 baseline
...
Former-commit-id: 572c500b0c67d72405bdf533c43c68b1955ae90e
2013-03-05 10:39:59 -06:00
Steve Harris
41dc7c0396
13.2.1-11 baseline
...
Former-commit-id: 9e9758e833caa408d168a5de2fe35be8e5451051
2013-03-04 17:34:39 -05:00
Steve Harris
cf951785c8
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: 8c1e3bc2413a6e1e6644f8ba8812edf591557f29
2013-02-25 15:54:24 -06:00
Steve Harris
6572452887
13.3.1-3 baseline
...
Former-commit-id: dc9e245f83eb0136157f8ca71f80f7fb9eb04796
2013-02-25 10:24:53 -05:00
Steve Harris
df6d6f598e
13.3.1-2 baseline
...
Former-commit-id: 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e
2013-02-25 10:18:36 -05:00
Steve Harris
48ebd10390
13.2.1-10 baseline
...
Former-commit-id: 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3
2013-02-25 10:11:00 -05:00
Steve Harris
0563d7ac18
13.3.1-1 baseline
...
Former-commit-id: 841b0cf38549666c4f65f0d0cff3b92d76c9e795
2013-02-21 09:36:59 -05:00
Steve Harris
7f2b4a8092
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: bfd58746491d6fcefc2f0e7d33907bf095f5b818
2013-02-21 09:25:27 -05:00
Steve Harris
71e8990021
13.3.1-1 baseline
...
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
a339cfb704
13.2.1-9 baseline
...
Former-commit-id: 915d8edd4670b38df0474de72cf19c6d8b9aa1a3
2013-02-20 14:11:20 -05:00
Steve Harris
1b631ebb9a
Merge branch 'master_13.2.1' into master_13.3.1
...
Former-commit-id: 8584d078529382aadd9f1eac527f89ea58808df1
2013-02-18 12:39:53 -06:00
Steve Harris
f81b382c04
13.2.1-8 baseline
...
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
Steve Harris
27d88edcb9
13.2.1-8 baseline
...
Former-commit-id: 1da0393f24829256c090d06ea8f7a0eca5e68bfd
2013-02-18 09:23:06 -05:00
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
