Steve Harris
|
428ec8a472
|
Issue #1782 - Merge branch 'master_13.3.1' (13.3.1-14) into omaha_13.3.1
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
edexOsgi/com.raytheon.uf.edex.datadelivery.request/.classpath
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
rpms/legal/FOSS_licenses/qpid/gentools/lib/LICENSE
Change-Id: I6b2513155d566aa09571c280b46cf309028a9861
Former-commit-id: 979d6a5d8c [formerly 2a0e399dc8] [formerly d997aeaee4 [formerly 6f42195bd8f6087fb8bb55232082c0ec5f867e12]]
Former-commit-id: d997aeaee4
Former-commit-id: e67b16bb03
|
2013-03-27 18:21:05 -05:00 |
|
Steve Harris
|
936e4adda2
|
13.3.1-14 baseline
Former-commit-id: 91a5e4578e [formerly 9022c500ce] [formerly 9fba973fd0 [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9fba973fd0
Former-commit-id: 2ca160caf0
|
2013-03-27 17:59:34 -05:00 |
|
Jonathan Sanchez
|
a579da7646
|
Issue #1819 Added precision fields for point source configuration.
Former-commit-id: a0a0199266 [formerly 79d87a96e7] [formerly b0f61cf86c [formerly b250ff50f8a2ac6ad8ec91e14735edcd6f053343]]
Former-commit-id: b0f61cf86c
Former-commit-id: eb13af2f50
|
2013-03-26 12:29:18 -05:00 |
|
Mike Duff
|
b366778df0
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-12) into omaha_13.3.1
Conflicts:
cave/build/static/common/cave/etc/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/procedures/ProcedureController.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/MPECommandConstants.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/MPEDisplayManager.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEGageResource.java
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/RegenHrFlds.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbAreaSourceDataAdaptor.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/ClosestPoint.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
edexOsgi/build.edex/edex/allElements.xml
edexOsgi/com.raytheon.edex.plugin.gfe/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParm.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/GridDatabase.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPTemplates.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/python/GfePyIncludeUtil.java
edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/MergeVTEC.py
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
javaUtilities/com.raytheon.wes2bridge.manager/src/com/raytheon/wes2bridge/manager/Wes2BridgeManager.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
rpms/awips2.qpid/0.7/build.sh
rpms/awips2.qpid/build.sh
Change-Id: Ic0602eeca2a6e9a5798cd19475de90a6122afcdb
Former-commit-id: c1f7d33bb8 [formerly 5d72795e1b] [formerly 9ebc7606b1 [formerly 98d23aed31d7226576943b6da0b1a0bcdc1eef58]]
Former-commit-id: 9ebc7606b1
Former-commit-id: 4c3011edce
|
2013-03-26 09:19:39 -05:00 |
|
Jonathan Sanchez
|
cd1095fb29
|
Issue #1605 Check if storm location is over an urban bound area.
Former-commit-id: 3ca4cc9dcf [formerly 06cd161d0e] [formerly ddcb4f3451 [formerly 2d58fc8149587bdc089db2b8a69f2a176c24ba23]]
Former-commit-id: ddcb4f3451
Former-commit-id: c9295e6762
|
2013-03-25 14:41:55 -05:00 |
|
Steve Harris
|
f80f98cee2
|
13.3.1-12 baseline
Former-commit-id: be96282207 [formerly 0be473728a] [formerly aaac0b51e5 [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: aaac0b51e5
Former-commit-id: bc439aee4f
|
2013-03-25 13:27:13 -05:00 |
|
Jonathan Sanchez
|
e01d47acfa
|
Issue #1810 Accepted other values/types for useDirs.
Former-commit-id: 2d6be3d3da [formerly d00c88a38c] [formerly b77ed18eb4 [formerly 7492d4e2ceea99c71f8040237610d95e45c1e78a]]
Former-commit-id: b77ed18eb4
Former-commit-id: 539c4dfa8e
|
2013-03-25 12:23:51 -05:00 |
|
Dave Hladky
|
01c6ff12a0
|
Issue #1782 Merge branch 'master_13.3.1' (13.3.1-9) into omaha_13.3.1
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
Change-Id: I86cba73da17ae0e057240abcfc2ba84b36a054bb
Former-commit-id: dc7b231bf0 [formerly 90f7f2110b] [formerly 3cdbfa3f25 [formerly 410c1d3ca42abf207615fb6ab3e8135c6f661461]]
Former-commit-id: 3cdbfa3f25
Former-commit-id: bd17b99bd1
|
2013-03-20 12:41:33 -05:00 |
|
Steve Harris
|
7e96d841d9
|
13.3.1-9 baseline
Former-commit-id: c7b2ef2d8c [formerly 468ae82305] [formerly f2b3fddfe2 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: f2b3fddfe2
Former-commit-id: 0375805e79
|
2013-03-19 14:22:56 -05:00 |
|
Jonathan Sanchez
|
234d73c905
|
Issue #1600 Created a utility class for adjust angles.
Change-Id: I91f01e52be5eb1878a2f26d10d035579772b2dd3
Former-commit-id: 80ea3e1ec2 [formerly 8f70214f66] [formerly 6a3281c878 [formerly f504b475165bd67f81f22ece8cead46d8d481eb2]]
Former-commit-id: 6a3281c878
Former-commit-id: c2b021427b
|
2013-03-05 16:02:47 -06:00 |
|
Steve Harris
|
b423579e4a
|
Merge branch 'master_13.3.1' (13.3.1-5) into omaha_13.3.1
Former-commit-id: 61a19a460b [formerly 305dd72969] [formerly 57f42761d7 [formerly 2e491cb6e37e984fb25c4bb4006e3b7a24b4109c]]
Former-commit-id: 57f42761d7
Former-commit-id: a8e1557c62
|
2013-03-05 12:27:49 -06:00 |
|
Steve Harris
|
3e0614b43a
|
13.3.1-4 baseline
Former-commit-id: d79303de13 [formerly 8c0b90f292] [formerly 2edca90902 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 2edca90902
Former-commit-id: 5e55ded3a9
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
41e1594be7
|
Merge branch 'development' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into development
Former-commit-id: 7ed1eacb6b [formerly 9bcabe2c5d] [formerly 098b1e1579 [formerly 16bc4b8c4e0261039a6c689afb4220f2ca6d904a]]
Former-commit-id: 098b1e1579
Former-commit-id: 57440abebb
|
2013-02-25 20:41:26 -06:00 |
|
Jonathan Sanchez
|
c861c71ae6
|
Issue #1625 Updated addOrRemoveCounty method.
Former-commit-id: f59a08963c [formerly cd6dd3c178] [formerly 8c2c7c97f7 [formerly 18760c0895c1776dd0448b0bb699ab5506c45511]]
Former-commit-id: 8c2c7c97f7
Former-commit-id: d4f4832d1a
|
2013-02-25 17:15:09 -06:00 |
|
Steve Harris
|
901cbbf56d
|
Merge branch 'master_13.3.1' into omaha_13.3.1
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Former-commit-id: cd99e680bb [formerly b50e384a0f] [formerly e8135b9c14 [formerly 2506058a672fce230e445bcc5bf8ae2f52df0766]]
Former-commit-id: e8135b9c14
Former-commit-id: 2398ef1e85
|
2013-02-25 16:05:22 -06:00 |
|
Steve Harris
|
05eb25f124
|
13.3.1-3 baseline
Former-commit-id: a55f438dd8 [formerly 6572452887] [formerly 8a64f142e5 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 8a64f142e5
Former-commit-id: 8d741715e3
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
370ed98038
|
13.3.1-2 baseline
Former-commit-id: 3e60b23072 [formerly df6d6f598e] [formerly 3d115ed3be [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: 3d115ed3be
Former-commit-id: e8a51dc780
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
4f155a183a
|
Merge branch 'development' into omaha_13.3.1
Conflicts:
cave/com.raytheon.uf.viz.core.maps/META-INF/MANIFEST.MF
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/dialogs/FfmpBasinTableDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesconfigAction.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/ProductTableComp.java
Former-commit-id: 64744fdb19 [formerly a0573644c4] [formerly 2641d578e2 [formerly e768a3e3a5016a88a4f0a3faa4bc82cfe0d9709c]]
Former-commit-id: 2641d578e2
Former-commit-id: 33dd2589f1
|
2013-02-21 15:41:39 -06:00 |
|
Steve Harris
|
0569ff413d
|
13.3.1-1 baseline
Former-commit-id: 96768407a5 [formerly 0563d7ac18] [formerly cabc8cf8b4 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: cabc8cf8b4
Former-commit-id: 92e4c7ba19
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
e4435815c9
|
13.3.1-1 baseline
Former-commit-id: 8ae397085e [formerly 71e8990021] [formerly d2a654625f [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: d2a654625f
Former-commit-id: 46d28be4a4
|
2013-02-20 16:19:40 -06:00 |
|
Roger Ferrel
|
94eb5757b5
|
Issue #1633 Change to WarnGenDialog so the checkFollowupSelection method uses Simulated Time.
Change-Id: I8d25084a88506f6e9bec72cfd40f02165d421869
Former-commit-id: a2e61d32a1 [formerly 1b693994a5] [formerly 1d51a10f4b [formerly 011b0822a8942d6dc4307b0a422060d9a97c7f8d]]
Former-commit-id: 1d51a10f4b
Former-commit-id: 211a39c333
|
2013-02-18 12:15:39 -06:00 |
|
Jonathan Sanchez
|
763280dd53
|
Issue #1624 Temporary fix for NullPointerException.
Former-commit-id: 18dd00e488 [formerly f507d23fed] [formerly fea6b44036 [formerly f95a402347ae45ad133206bfea796b240decf0a6]]
Former-commit-id: fea6b44036
Former-commit-id: 1486022395
|
2013-02-15 12:31:21 -06:00 |
|
Jonathan Sanchez
|
352d3dea5a
|
Issue #1607 Added time variables for CORs.
Former-commit-id: 38802d3df8 [formerly 6d968dc09d] [formerly 3025639923 [formerly 311f633ba47efcf3b13f77867e1fa32a584f3232]]
Former-commit-id: 3025639923
Former-commit-id: bb797eeb74
|
2013-02-15 09:59:12 -06:00 |
|
Jonathan Sanchez
|
c1a832ef3a
|
Issue #1605 Improved finding closest area locations.
Former-commit-id: 4555420e82 [formerly 9641b67da4] [formerly 1722713689 [formerly b8a43d95121a1876dc8136bd5758e9452167fad2]]
Former-commit-id: 1722713689
Former-commit-id: 459472a793
|
2013-02-14 11:12:23 -06:00 |
|
Jonathan Sanchez
|
b6047c78bb
|
Issue #1606 Did not set default bullets for CORs.
Former-commit-id: 0c3d09f230 [formerly a061ee1363] [formerly 0a8b38d8e9 [formerly 4eb79ee90cf684b8ae38404586a65f09742eb348]]
Former-commit-id: 0a8b38d8e9
Former-commit-id: bdcac83ac7
|
2013-02-13 10:08:01 -06:00 |
|
Lee Venable
|
6ecbdae667
|
Merge "Issue #1600 Correctly set the StormTrackData motion direction for a CAN and EXP." into development
Former-commit-id: 39351ec038 [formerly 0d1ebacc71] [formerly 10008011b4 [formerly c821cfcc556efb4586eb6e9122a90731a7f42083]]
Former-commit-id: 10008011b4
Former-commit-id: 44a4701c1e
|
2013-02-13 08:58:07 -06:00 |
|
Max Schenkelberg
|
27b8d411b7
|
Issue #1500 Fixed concurrent mod exceptions
Change-Id: I66c2bd159e7631a826a5bb9d0f06d0f3364a2f22
Former-commit-id: 599e3bd319 [formerly 7c3f0cc295] [formerly ccf58ba87e [formerly b7f6998ac508c65440c2969b78e45de8f19c0ad9]]
Former-commit-id: ccf58ba87e
Former-commit-id: 55f882b00f
|
2013-02-12 17:35:30 -06:00 |
|
Jonathan Sanchez
|
b4a7b7407b
|
Issue #1600 Correctly set the StormTrackData motion direction for a CAN
and EXP.
Former-commit-id: cd8d9ff3db [formerly 6d463f0c74] [formerly c2a9e1c215 [formerly e82da0ee983f1a9889e25b088e2eadebb8c08fff]]
Former-commit-id: c2a9e1c215
Former-commit-id: e8f64e5121
|
2013-02-12 17:20:55 -06:00 |
|
Steve Harris
|
7c5e57d662
|
Merge branch 'ss_builds' (13.2.1-7) into development
Former-commit-id: 760be15f59 [formerly cc2757790c] [formerly de437bb4fc [formerly 62e4a9045e32eaaf1a52ff06d86f82d2693021bd]]
Former-commit-id: de437bb4fc
Former-commit-id: 3690662bf7
|
2013-02-12 15:30:10 -06:00 |
|
Steve Harris
|
2d04721c4b
|
13.2.1-7 baseline
Former-commit-id: 3f271af195 [formerly 2fb5a31b98] [formerly 6baff6a089 [formerly 85a6ac3debfd1691b5d44c547d76a7ae9e19523f]]
Former-commit-id: 6baff6a089
Former-commit-id: bac9b967aa
|
2013-02-12 15:27:30 -06:00 |
|
Steve Harris
|
6780b60df5
|
13.2.1-7 baseline
Former-commit-id: 0b7287b130 [formerly 6fad5da5ed] [formerly 9c23bf6e73 [formerly fa14e53e7a52c1c69c37e60a8df0b8be03db9bd2]]
Former-commit-id: 9c23bf6e73
Former-commit-id: 6bfbfc8a5e
|
2013-02-12 14:51:26 -06:00 |
|
Steve Harris
|
4bc81ce1de
|
13.2.1-7 baseline
Former-commit-id: 370b2558f0 [formerly 1ce95d1df2] [formerly c86246ab4d [formerly 132297ab4acf8e649e3cf9a3d54d4f4676b280be]]
Former-commit-id: c86246ab4d
Former-commit-id: 37be2e3f23
|
2013-02-11 16:50:39 -05:00 |
|
Steve Harris
|
dd5d3741b0
|
13.2.1-6 baseline
Former-commit-id: d6b32d9d1f [formerly 89a698bc02] [formerly bd02b0b1b4 [formerly c5df294c580862d0ac52b44bc473d4512f77cf2e]]
Former-commit-id: bd02b0b1b4
Former-commit-id: efe8c4eae4
|
2013-02-08 15:59:40 -06:00 |
|
Steve Harris
|
bbe92e6824
|
13.2.1-6 baseline
Former-commit-id: d66ad2f77b [formerly d0752de66c] [formerly a46e33f06e [formerly 75e7c2a9423a7caa7f97143fa871be6d0ffe34bb]]
Former-commit-id: a46e33f06e
Former-commit-id: 30d38334cc
|
2013-02-07 16:00:39 -06:00 |
|
Steve Harris
|
1f44caaedb
|
13.2.1-6 baseline
Former-commit-id: cc48fa4fc6 [formerly b80782b081] [formerly 53adfb7345 [formerly 2bdf04a09ff6a145eb73f5ad5c1e5140c8a3e0d0]]
Former-commit-id: 53adfb7345
Former-commit-id: dee1480773
|
2013-02-07 16:38:44 -05:00 |
|
Max Schenkelberg
|
f186c355ac
|
Issue #1500 Sped up warngen text creation by calculating hatched polygon and area in Job when polygon or area changes, initializing velocity for template running when warngen starts, only requesting full warning records when they are requested for use from CurrentWarnings, and only requesting partial ActivateTableRecords for determining active watch info.
Change-Id: Ia120f2d20b99e4d152554727597b22af762413ac
Former-commit-id: f73d55e920 [formerly bb68c95589] [formerly fdc5759b53 [formerly 26af6badfffd930b8051af8e33ff6897d6c87073]]
Former-commit-id: fdc5759b53
Former-commit-id: 014eaa1666
|
2013-02-06 17:21:13 -06:00 |
|
Steve Harris
|
48a0ffda4d
|
Merge branch 'ss_builds' (13.2.1-5) into 13.2.1_delivery
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
Former-commit-id: 14f23d4227 [formerly a16ac7819c] [formerly 6c6b53679b [formerly 873c1773504d6dd9421b92f6193c32e477e4533c]]
Former-commit-id: 6c6b53679b
Former-commit-id: 28ddc9bad8
|
2013-02-06 11:08:53 -06:00 |
|
Steve Harris
|
7497a15e22
|
13.2.1-5 baseline
Former-commit-id: a6b3cde1ff [formerly 232734091d] [formerly 146fcc6da8 [formerly c56f1fdc3e2419c5dd6bebbbb1e0e688bd5e0092]]
Former-commit-id: 146fcc6da8
Former-commit-id: 1c602ec3a7
|
2013-02-06 11:02:32 -06:00 |
|
Steve Harris
|
72ca459f76
|
13.2.1-5 baseline
Former-commit-id: d6a9d68c10 [formerly a11ab8f26e] [formerly d26a488ee4 [formerly d117c677ade20193836680bc7905ba7bbf9c67b2]]
Former-commit-id: d26a488ee4
Former-commit-id: 4a745c9483
|
2013-02-04 16:31:26 -06:00 |
|
Steve Harris
|
39cb931bc9
|
13.2.1-5 baseline
Former-commit-id: 1a74d2f0c5 [formerly b4014794de] [formerly f99f99e2f5 [formerly 7a6958217f8b67edac937a23cb1c2ae8a89cedce]]
Former-commit-id: f99f99e2f5
Former-commit-id: 418d8ca0d8
|
2013-02-04 16:36:29 -05:00 |
|
Jonathan Sanchez
|
ed42a6d939
|
Issue #1557 Added allowDuplicates XML element to point source configuration.
Change-Id: I20a05413ef93c4b1268a5b9d3d5541375a47523b
Former-commit-id: b2870a012e [formerly da1061baa6] [formerly f72968824a [formerly 945b2e64b971fc31691d550e6c629f43db9a9c99]]
Former-commit-id: f72968824a
Former-commit-id: 53eddc3ec8
|
2013-01-31 16:01:04 -06:00 |
|
Steve Harris
|
3f25b862c8
|
13.2.1-4 baseline
Former-commit-id: ae2859d5a2 [formerly 8f2e7d4437] [formerly 0d7f53b6f4 [formerly d4fd198979dbc5d77a6bf836685cb658e7ac6cfe]]
Former-commit-id: 0d7f53b6f4
Former-commit-id: 2998f750f4
|
2013-01-31 11:40:31 -06:00 |
|
Steve Harris
|
06f4b4ad5a
|
13.2.1-4 baseline
Former-commit-id: f2b28cfa56 [formerly 1beb655fa0] [formerly 1e77a6f0bd [formerly 7a04400ebdaabfd380fc9fc0f1dae119f49e59ee]]
Former-commit-id: 1e77a6f0bd
Former-commit-id: e6e4de6247
|
2013-01-31 12:05:59 -05:00 |
|
Max Schenkelberg
|
0019b43582
|
Issue #1499 Fixed various bugs with Warngen that caused slow initial loading as well as slow interactions. Loaded maps asynchronous and group geometries from table in GeometryCollection instead of unioning into invalid MultiPolygon.
Change-Id: I74312305d80762e55f64a5ca70fc454063f2f01d
Former-commit-id: 796522b6d0 [formerly 95ccc76272] [formerly 1dbeeb84fb [formerly 493ac37a227259db4c1ea01afa3bd7a9b77095f7]]
Former-commit-id: 1dbeeb84fb
Former-commit-id: 99c8a97f8c
|
2013-01-28 14:30:53 -06:00 |
|
Steve Harris
|
251a9c0195
|
13.2.1-2 baseline
Former-commit-id: 0006a2b6cb [formerly 7a7f7c45ca] [formerly c3e4551dfa [formerly b8762009cb6f3bfa17984c2dcce65d5a48c6a844]]
Former-commit-id: c3e4551dfa
Former-commit-id: 1153d80c5b
|
2013-01-25 09:07:12 -06:00 |
|
Steve Harris
|
d9be4dce21
|
13.2.1-2 baseline
Former-commit-id: 33bc5fd816 [formerly 83e9157df7] [formerly 328c6dccad [formerly bd9eec1d4e6fd843c7bb594b8adb882d72edc6cf]]
Former-commit-id: 328c6dccad
Former-commit-id: 47cc08ac79
|
2013-01-23 11:18:44 -05:00 |
|
Steve Harris
|
8ed6a53113
|
13.2.1-1 baseline
Former-commit-id: 48d1aa7732 [formerly 9771dfae6b] [formerly c63f9bcae0 [formerly 6831a29efca54cfde39ab6a462f76ca2ac206f49]]
Former-commit-id: c63f9bcae0
Former-commit-id: f6670806bf
|
2013-01-23 11:13:03 -05:00 |
|
Richard Peter
|
79ef100838
|
Merge branch 'ss_builds' (13.2.1-1) into development
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a966546e31 [formerly 3fb7d96ec1] [formerly 1dbb34523b [formerly 1a07daa97b2000f31ea4fd98890a15477b85b5f3]]
Former-commit-id: 1dbb34523b
Former-commit-id: 345dfd2ca9
|
2013-01-14 18:07:17 -06:00 |
|
Steve Harris
|
e34695538d
|
13.2.1-1 baseline
Former-commit-id: 5dfe4d10f1 [formerly e62172c8c7] [formerly 81849e3cbb [formerly 30d12654dea302c2bb0546edcb3b7ddd04ddd046]]
Former-commit-id: 81849e3cbb
Former-commit-id: 8713dfc5ca
|
2013-01-14 18:42:21 -05:00 |
|
Richard Peter
|
80bf1d7a28
|
Issue #1408: Merge 13.1.2-6 into development
Former-commit-id: d0a6ba23e5 [formerly 029ebaa63a] [formerly 328be6ac2b [formerly 7f8ad9de743a19d21a6784fa7563a88c6bdd4d3c]]
Former-commit-id: 328be6ac2b
Former-commit-id: 6a5a0d7d09
|
2013-01-09 17:55:05 -06:00 |
|