Steve Harris
|
851f9df229
|
14.1.1-3 baseline
Former-commit-id: 5739b4f832 [formerly cbfd1a2e3f6b0688eb8e95ef0eaec1450b4bfc03]
Former-commit-id: 94f24e0d8a
|
2013-10-28 10:46:02 -04:00 |
|
Steve Harris
|
8ba7d392d6
|
13.5.2-8 baseline
Former-commit-id: 18325949fb [formerly 6effdd3f5ce46910c89236306fa33499eada174f]
Former-commit-id: 94aa71fcd1
|
2013-10-04 11:30:03 -04:00 |
|
Steve Harris
|
b5cb693619
|
13.5.2-7 baseline
Former-commit-id: a212c30bd7 [formerly dace09a228fa4bef6bddc1388f12d35adcbd7543]
Former-commit-id: 0f8fc513bf
|
2013-09-30 13:05:31 -04:00 |
|
Steve Harris
|
059549438a
|
13.5.2-6 baseline
Former-commit-id: 3837fbe670 [formerly 726299a49759971bf9a79ca7598c4f39ecb6721c]
Former-commit-id: 3821475d4e
|
2013-09-23 10:03:15 -04:00 |
|
Steve Harris
|
31111f4f52
|
13.5.2-5 baseline
Former-commit-id: 67cceefe5d [formerly ed50e9426fd099fd9336b7bfc8d0c5c35f8500f4]
Former-commit-id: 0745317d53
|
2013-09-16 10:14:25 -04:00 |
|
Steve Harris
|
595e7bc0d9
|
13.5.2-4 baseline
Former-commit-id: 58c6821427 [formerly da631849bc9eaaa5c83c2393520b6099413107a5]
Former-commit-id: e3c935d48b
|
2013-09-12 11:13:59 -04:00 |
|
Steve Harris
|
91fb128c17
|
13.5.2-3 baseline
Former-commit-id: bae0a20b8e [formerly 51ecc8e9e15940e6cbe2c5da55edc5860ea8b0ca]
Former-commit-id: 9fdd0e51a0
|
2013-09-04 14:13:29 -04:00 |
|
Steve Harris
|
8cde3b2b54
|
13.5.2-2 baseline
Former-commit-id: 9e4bf0cf2e [formerly 6cecce21eb6a7c9b72d7a61936dcbe4f4688fba9]
Former-commit-id: 4a47fb97c5
|
2013-08-29 15:01:29 -04:00 |
|
Steve Harris
|
894d2425b2
|
13.5.2-1 baseline
Former-commit-id: 542b2c3d18 [formerly a362ca91ee5972a1501a2842191fbe2e23feac9c]
Former-commit-id: 73dd0f166c
|
2013-08-28 09:43:48 -04:00 |
|
Steve Harris
|
d931b80e70
|
13.5.1-18 baseline
Former-commit-id: 0a7acf96c7 [formerly f407ad6db2f621a5be95939aea88f49d874d1ab6]
Former-commit-id: afb34814dd
|
2013-08-22 09:12:43 -04:00 |
|
Steve Harris
|
2d882ccb54
|
13.5.1-17 baseline
Former-commit-id: b210c90245 [formerly c5d75a6473b2659b9ac1054a1160c921bd8c1c16]
Former-commit-id: 9dd7dc5d20
|
2013-08-19 16:34:24 -04:00 |
|
Steve Harris
|
6818d80085
|
13.5.1-16 baseline
Former-commit-id: 7ce0234d76 [formerly 2fcbcde58066c18ab423c94c37f446ab5e7f42da]
Former-commit-id: cd3b63d961
|
2013-08-15 13:40:37 -04:00 |
|
Steve Harris
|
535218c676
|
13.5.1-15 baseline
Former-commit-id: c6dc1817e7 [formerly dbf9107f9c775f9a1df759bc341c0722f5fc92f2]
Former-commit-id: 53e96e21db
|
2013-08-14 10:24:26 -04:00 |
|
Steve Harris
|
b848317203
|
13.5.1-14 baseline
Former-commit-id: 80e5f7fbd4 [formerly fe7b1a704ee92b34684e4f9059bd61cfa28dd485]
Former-commit-id: d695e5debe
|
2013-08-14 10:07:41 -04:00 |
|
Greg Armendariz
|
f0b62a22bf
|
13.5.1-13 baseline
Former-commit-id: 5577e686c1 [formerly 3a9c1057ea5f7d72ba1d962766ad0e68ded9b3e4]
Former-commit-id: 29b823fee4
|
2013-08-08 17:00:36 -04:00 |
|
Greg Armendariz
|
01d067cff9
|
13.5.1-12 baseline
Former-commit-id: fe51885ba7 [formerly eb9cd610891ce5830f4a169db036a49f32c1e63b]
Former-commit-id: c9898ba8d1
|
2013-08-08 15:34:01 -04:00 |
|
Greg Armendariz
|
c402dbf6e9
|
13.5.1-11 baseline
Former-commit-id: 4ec04083bd [formerly 7142e607157f6d6ac1ba5cb24f3b3dbf9ab75f7f]
Former-commit-id: ea7b22500e
|
2013-08-07 14:34:27 -04:00 |
|
Greg Armendariz
|
e276b0fabe
|
13.5.1-10 baseline
Former-commit-id: acf7ced37b [formerly c2c6882c462c34ce9cb9ea3399071c2a121ba0f7]
Former-commit-id: 852455843f
|
2013-08-07 14:14:46 -04:00 |
|
Steve Harris
|
778df21de9
|
13.5.1-9 baseline
Former-commit-id: 6e60cd9a79 [formerly 06a1dd45adedbe259f9c30ebf93f2f90017fe945]
Former-commit-id: 97fe6a670f
|
2013-08-01 09:20:23 -04:00 |
|
Steve Harris
|
392faf86e7
|
13.5.1-8 baseline
Former-commit-id: dfbf9a5afe [formerly 37504305d70e6aaf6a7bdfad8267054af0612515]
Former-commit-id: 3bece5e5d0
|
2013-07-26 09:02:34 -04:00 |
|
Steve Harris
|
630705aa3f
|
13.5.1-7 baseline
Former-commit-id: 86ce1248c2 [formerly 4310ff14ffe9c7975574bb8b40bef668a90649e4]
Former-commit-id: bf58a81b38
|
2013-07-18 12:07:22 -04:00 |
|
Greg Armendariz
|
5894853996
|
13.5.1-6 baseline
Former-commit-id: b9044b1195 [formerly 30b8d4c0ce425715ea44a394b4b4f143c64b416a]
Former-commit-id: 7e09fa5a0b
|
2013-07-10 10:04:22 -04:00 |
|
Greg Armendariz
|
82aabf1066
|
13.5.1-5 baseline
Former-commit-id: ea7ac37930 [formerly e0157ab61ca5f2a62d78993a27893778fa119c4f]
Former-commit-id: 492f92ef7b
|
2013-07-03 12:20:27 -04:00 |
|
Steve Harris
|
c56be8a332
|
13.5.1-4 baseline
Former-commit-id: e197f23ce3 [formerly d18b403b332dff67d1c85d4317bbceda337d1b41]
Former-commit-id: 70e4ff30a6
|
2013-06-28 09:46:25 -04:00 |
|
Steve Harris
|
d8176d4a4c
|
13.5.1-3 baseline
Former-commit-id: 72d22a30c9 [formerly cc90f0c02410fef504ec9de389c07dfa41164247]
Former-commit-id: 63803c1424
|
2013-06-24 09:29:43 -04:00 |
|
Steve Harris
|
bc60b22f00
|
13.5.1-2 baseline
Former-commit-id: 3386330894 [formerly 36f4554f8f80812a5ffa0d243fe1a4ad6e330192]
Former-commit-id: adb779323d
|
2013-06-17 15:01:22 -04:00 |
|
Steve Harris
|
6384018950
|
13.5.1-1 baseline
Former-commit-id: fe872355a7 [formerly 72a49a353cb22c89c9aa19ed1f4a681c3e89d5f3]
Former-commit-id: 998961612c
|
2013-06-10 15:17:17 -04:00 |
|
Steve Harris
|
bb6628c17f
|
Merge branch 'master_13.4.1' into master_13.5.1
Conflicts (solved by taking all of 13.4.1-14):
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/ProductScriptsDialog.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/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
rpms/awips2.core/Installer.ldm/component.spec
rpms/build/i386/build.sh
Former-commit-id: 2fc7f80939 [formerly 388fb201c6914d9ec7986a1017df57e5e2de0633]
Former-commit-id: b0e5c758dc
|
2013-06-10 15:07:59 -04:00 |
|
Steve Harris
|
be236eb722
|
13.4.1-14 baseline
Former-commit-id: 18b90226a2 [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]
Former-commit-id: c749e122eb
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
e3b8086bd0
|
13.4.1-13 baseline
Former-commit-id: de476791fb [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]
Former-commit-id: 87b9712009
|
2013-05-29 16:30:09 -04:00 |
|
Steve Harris
|
397bbf674a
|
13.4.1-12 baseline
Former-commit-id: e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]
Former-commit-id: 6a97b4325a
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
d6319a2ca6
|
13.4.1-11 baseline
Former-commit-id: c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]
Former-commit-id: 2edee36158
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
68fe2134b8
|
13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]
Former-commit-id: 9a403b3615
|
2013-05-20 10:52:47 -04:00 |
|
Steve Harris
|
88eee9cbfa
|
13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]
Former-commit-id: bcf7f15c90
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
576a74fe0b
|
13.4.1-8 baseline
Former-commit-id: c59b52a266 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]
Former-commit-id: 19866e7032
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
8072752c77
|
13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 4c6ff79e71
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
6fcbb5ae6b
|
13.4.1-6 baseline
Former-commit-id: 16fe8cc5a2 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]
Former-commit-id: 8379977673
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
aa9a719836
|
13.4.1-5 baseline
Former-commit-id: 4ae0e2e858 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]
Former-commit-id: 85bbf6d242
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
344054d3e9
|
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 0f76c3cbee [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]
Former-commit-id: 1a6fd7edfd
|
2013-05-03 09:20:30 -05:00 |
|
Steve Harris
|
99f4569650
|
13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: d33e5861aa
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
3486902772
|
13.4.1-3 baseline
Former-commit-id: 86e96f378c [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]
Former-commit-id: 54afedf617
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
9212be8b74
|
13.4.1-2 baseline
Former-commit-id: 5ebd58a0b3 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]
Former-commit-id: 52f0ae4758
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
f95e0ad10b
|
13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 2f517b7713
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
035878a846
|
Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: e6d37f3e6d [formerly 59bd064351a843fd514514de9dc942d13c6d7793]
Former-commit-id: 7957c52dec
|
2013-04-15 09:34:45 -05:00 |
|
Steve Harris
|
07f7e6e2b4
|
13.3.1-20 baseline
Former-commit-id: 446bec6f49 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]
Former-commit-id: 25432cc388
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
dc9fef33a9
|
13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]
Former-commit-id: 9be238bcc4
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
3487a41532
|
Merge branch 'master_13.3.1' (13.3.1-18) into master_13.4.1
Initiating master_13.4.1 with 13.3.1-18
conflicts resolved by taking all of 13.3.1-18
Conflicts:
cave/com.raytheon.uf.viz.common.core.feature/feature.xml
cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/procedures/ProcedureDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/AbstractStormTrackResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ReferenceSetManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.product.awips/awips.product
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/AbstractDbSourceDataAdaptor.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
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIManager.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenUIState.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/hpcGuideNDFD.xml
edexOsgi/com.raytheon.edex.rpgenvdata/src/com/raytheon/edex/rpgenvdata/RPGEnvironmentalDataManager.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/FFMPGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFMPProcessor.java
edexOsgi/com.raytheon.uf.edex.plugin.ffmp/src/com/raytheon/uf/edex/plugin/ffmp/common/FFTI.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/src/com/raytheon/uf/edex/plugin/grid/dao/GridDao.java
pythonPackages/pypies/pypies/impl/H5pyDataStore.py
Former-commit-id: d98a119f4d [formerly 735ce03302b54116c8545daf043585fb16fabd11]
Former-commit-id: ea34b1db1e
|
2013-04-04 11:12:22 -05:00 |
|
Steve Harris
|
bf8a149596
|
Merge AWIPS2 master branch (13.2.1-21) into master
Former-commit-id: 19bb737425 [formerly a5433b05559621bce842ce98f68f9fd151109531]
Former-commit-id: 0676aa710a
|
2013-04-04 09:54:02 -05:00 |
|
Steve Harris
|
c946213066
|
Merge branch 'master_13.2.1' into master
Former-commit-id: 9df0038ea3 [formerly 9d79a4e435d69849510f51b6ed8ac13f8eda438a]
Former-commit-id: f0b9589c11
|
2013-04-04 10:51:40 -04:00 |
|
Steve Harris
|
4b2462390e
|
Merge AWIPS2 master branch (13.2.1-19) into master
All conflicts overridden by 'theirs' merge - all of AWIPS2 master
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/gui/WarngenUIState.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: dab32b0413 [formerly 9cab4557a50e2bcda09365a86b54e5e5613f0a57]
Former-commit-id: 4861007a03
|
2013-04-04 08:22:05 -05:00 |
|