Steve Harris
|
294c127b0a
|
13.4.1-10 baseline
Former-commit-id: 92152778b9 [formerly 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]
Former-commit-id: 9a403b3615
Former-commit-id: 68fe2134b8
|
2013-05-20 10:52:47 -04:00 |
|
Steve Harris
|
301821988e
|
13.4.1-9 baseline
Former-commit-id: aff41713f9 [formerly bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]]
Former-commit-id: bcf7f15c90
Former-commit-id: 88eee9cbfa
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
02dba50c00
|
13.4.1-8 baseline
Former-commit-id: c59b52a266 [formerly 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]]
Former-commit-id: 19866e7032
Former-commit-id: 576a74fe0b
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
81bc07bff4
|
13.4.1-7 baseline
Former-commit-id: 8347bed50e [formerly 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]]
Former-commit-id: 4c6ff79e71
Former-commit-id: 8072752c77
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
5544c4a072
|
13.4.1-6 baseline
Former-commit-id: 16fe8cc5a2 [formerly 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]]
Former-commit-id: 8379977673
Former-commit-id: 6fcbb5ae6b
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
313481c30e
|
13.4.1-5 baseline
Former-commit-id: 4ae0e2e858 [formerly 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]]
Former-commit-id: 85bbf6d242
Former-commit-id: aa9a719836
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
29777b406e
|
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 0f76c3cbee [formerly 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]]
Former-commit-id: 1a6fd7edfd
Former-commit-id: 344054d3e9
|
2013-05-03 09:20:30 -05:00 |
|
Steve Harris
|
ef5893b279
|
13.4.1-4 baseline
Former-commit-id: 7a78f8ac6e [formerly d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]]
Former-commit-id: d33e5861aa
Former-commit-id: 99f4569650
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
03ff5cd82c
|
13.4.1-3 baseline
Former-commit-id: 86e96f378c [formerly 54afedf617 [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]]
Former-commit-id: 54afedf617
Former-commit-id: 3486902772
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
4533276dd5
|
13.4.1-2 baseline
Former-commit-id: 5ebd58a0b3 [formerly 52f0ae4758 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]]
Former-commit-id: 52f0ae4758
Former-commit-id: 9212be8b74
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
79567aac51
|
13.4.1-1 baseline
Former-commit-id: 00332e6305 [formerly 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]]
Former-commit-id: 2f517b7713
Former-commit-id: f95e0ad10b
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
9d57ad1675
|
Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: e6d37f3e6d [formerly 7957c52dec [formerly 59bd064351a843fd514514de9dc942d13c6d7793]]
Former-commit-id: 7957c52dec
Former-commit-id: 035878a846
|
2013-04-15 09:34:45 -05:00 |
|
Steve Harris
|
9e73c3f1ed
|
13.3.1-20 baseline
Former-commit-id: 446bec6f49 [formerly 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]]
Former-commit-id: 25432cc388
Former-commit-id: 07f7e6e2b4
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
196767d525
|
13.3.1-19 baseline
Former-commit-id: abaf9f12f9 [formerly 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]]
Former-commit-id: 9be238bcc4
Former-commit-id: dc9fef33a9
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
55655fdab9
|
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 ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]]
Former-commit-id: ea34b1db1e
Former-commit-id: 3487a41532
|
2013-04-04 11:12:22 -05:00 |
|
Steve Harris
|
50106822ea
|
13.2.1-21 baseline
Former-commit-id: 33bd359cfe [formerly d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]]
Former-commit-id: d4358b93dc
Former-commit-id: a86d44584d
|
2013-04-03 18:08:41 -04:00 |
|
Steve Harris
|
3aa43b1b0d
|
13.2.1-20 baseline
Former-commit-id: 539faf0a71 [formerly 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]]
Former-commit-id: 6a55bc5dff
Former-commit-id: ad663b925c
|
2013-04-03 18:05:39 -04:00 |
|
Steve Harris
|
e621424fcb
|
13.3.1-18 baseline
Former-commit-id: ce6a06a7e3 [formerly a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]]
Former-commit-id: a2b098d86d
Former-commit-id: f3e79bcc9d
|
2013-04-03 14:58:29 -05:00 |
|
Steve Harris
|
1b8e623c9b
|
13.3.1-17 baseline
Former-commit-id: a3fe998f8f [formerly 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]]
Former-commit-id: 7bf9966dcb
Former-commit-id: f28b85d42f
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
712c13a655
|
13.3.1-16 baseline
Former-commit-id: 3066dd33e5 [formerly 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]]
Former-commit-id: 51380726d4
Former-commit-id: a262f22cee
|
2013-04-01 11:39:08 -05:00 |
|
Steve Harris
|
70fece2da1
|
13.3.1-15 baseline
Former-commit-id: 3d8ed484be [formerly eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]]
Former-commit-id: eb1dab3864
Former-commit-id: 4cf3ad6abb
|
2013-04-01 11:33:20 -05:00 |
|
Steve Harris
|
127cd26812
|
13.2.1-19 baseline
Former-commit-id: fc859547f8 [formerly bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]]
Former-commit-id: bebd9ad1f4
Former-commit-id: 88a4bb0924
|
2013-04-01 10:11:24 -04:00 |
|
Steve Harris
|
bf64a0dc2f
|
13.3.1-14 baseline
Former-commit-id: 4d4234d5c9 [formerly c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]]
Former-commit-id: c29076949e
Former-commit-id: 6a4bbd9f1a
|
2013-03-27 22:10:03 -05:00 |
|
Steve Harris
|
f9b3430485
|
13.3.1-14 baseline
Former-commit-id: 9fba973fd0 [formerly 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]]
Former-commit-id: 9022c500ce
Former-commit-id: 91a5e4578e
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
0f2ebb8f10
|
13.3.1-13 baseline
Former-commit-id: c65f3e68e5 [formerly c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]]
Former-commit-id: c77a452f5a
Former-commit-id: 792171756f
|
2013-03-26 12:43:07 -05:00 |
|
Steve Harris
|
6f374b35d0
|
13.3.1-12 baseline
Former-commit-id: aaac0b51e5 [formerly 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]]
Former-commit-id: 0be473728a
Former-commit-id: be96282207
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
408234ee2b
|
13.3.1-11 baseline
Former-commit-id: 373d13df39 [formerly 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]]
Former-commit-id: 9cdd90e382
Former-commit-id: 2edab61540
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
76ea9120d8
|
13.3.1-10 baseline
Former-commit-id: 7078eec1b1 [formerly 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]]
Former-commit-id: 073687d9a9
Former-commit-id: 57f4676b6c
|
2013-03-20 15:53:01 -05:00 |
|
Steve Harris
|
0bb9bde142
|
13.2.1-18 baseline
Former-commit-id: f52a716b3f [formerly 3fd5612f89 [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]]
Former-commit-id: 3fd5612f89
Former-commit-id: 97dfda9020
|
2013-03-20 16:46:35 -04:00 |
|
Steve Harris
|
6ebecda008
|
13.3.1-9 baseline
Former-commit-id: f2b3fddfe2 [formerly 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]]
Former-commit-id: 468ae82305
Former-commit-id: c7b2ef2d8c
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
dd30a5f940
|
13.3.1-8 baseline
Former-commit-id: c15b3ffe20 [formerly f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]]
Former-commit-id: f97d78994b
Former-commit-id: bc9df0a8f9
|
2013-03-18 15:43:32 -05:00 |
|
Steve Harris
|
3dff54e277
|
13.2.1-17 baseline
Former-commit-id: e3e250c817 [formerly 43aa54dc4c [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]]
Former-commit-id: 43aa54dc4c
Former-commit-id: 4bb3ad8bde
|
2013-03-18 13:01:37 -04:00 |
|
Steve Harris
|
f677bae97c
|
13.2.1-16 baseline
Former-commit-id: ef031e34df [formerly a75fe06bfe [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]]
Former-commit-id: a75fe06bfe
Former-commit-id: 1eca318fab
|
2013-03-18 12:57:34 -04:00 |
|
Steve Harris
|
b16f2448a9
|
13.2.1-15 baseline
Former-commit-id: 7617a2437f [formerly 7b52d3eb6e [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]]
Former-commit-id: 7b52d3eb6e
Former-commit-id: ff687e572b
|
2013-03-18 12:53:04 -04:00 |
|
Steve Harris
|
69d88d9067
|
13.2.1-14 baseline
Former-commit-id: af22cfad98 [formerly 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]]
Former-commit-id: 00ce32ea21
Former-commit-id: 5584a04cbd
|
2013-03-18 12:46:46 -04:00 |
|
Steve Harris
|
23faf84455
|
13.3.1-7 baseline
Former-commit-id: e12ed113ae [formerly a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]]
Former-commit-id: a72254cc75
Former-commit-id: 97d2f521e4
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
3ea50babf5
|
13.3.1-6.1 baseline
Former-commit-id: a062803c8c [formerly fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]]
Former-commit-id: fa9d260c2b
Former-commit-id: 6d96471b9b
|
2013-03-13 08:28:26 -05:00 |
|
Steve Harris
|
4eef6862d6
|
13.3.1-6 baseline
Former-commit-id: 566b677d09 [formerly 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]]
Former-commit-id: 3a4c7931e1
Former-commit-id: 2e110bd151
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
301e4186db
|
13.2.1-13 baseline
Former-commit-id: 94fa707724 [formerly 088e318fda [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]]
Former-commit-id: 088e318fda
Former-commit-id: 7f54c8ce19
|
2013-03-11 11:55:20 -04:00 |
|
Steve Harris
|
719b5f8ef7
|
13.2.1-12 baseline
Former-commit-id: de136aad72 [formerly 23a41ad607 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]]
Former-commit-id: 23a41ad607
Former-commit-id: 1e9f9af89c
|
2013-03-07 13:43:04 -05:00 |
|
Steve Harris
|
e4a1c61ad5
|
13.3.1-5 baseline
Former-commit-id: e26f7eb151 [formerly a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]]
Former-commit-id: a89221c75b
Former-commit-id: 8123d5ac45
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
9066d511fe
|
13.3.1-4 baseline
Former-commit-id: 2edca90902 [formerly 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]]
Former-commit-id: 8c0b90f292
Former-commit-id: d79303de13
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
5acc4265ae
|
13.2.1-11 baseline
Former-commit-id: 0684d77845 [formerly 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]]
Former-commit-id: 41dc7c0396
Former-commit-id: 0fa57eeaf2
|
2013-03-04 17:34:39 -05:00 |
|
Steve Harris
|
786642589b
|
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 cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]]
Former-commit-id: cf951785c8
Former-commit-id: 07167ec04f
|
2013-02-25 15:54:24 -06:00 |
|
Steve Harris
|
4a0eea00b5
|
13.3.1-3 baseline
Former-commit-id: 8a64f142e5 [formerly 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]]
Former-commit-id: 6572452887
Former-commit-id: a55f438dd8
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
0b3acc0130
|
13.3.1-2 baseline
Former-commit-id: 3d115ed3be [formerly df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]]
Former-commit-id: df6d6f598e
Former-commit-id: 3e60b23072
|
2013-02-25 10:18:36 -05:00 |
|
Steve Harris
|
a08b994afd
|
13.2.1-10 baseline
Former-commit-id: acf2f8ff92 [formerly 48ebd10390 [formerly 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3]]
Former-commit-id: 48ebd10390
Former-commit-id: 317c81a797
|
2013-02-25 10:11:00 -05:00 |
|
Steve Harris
|
9bdd52a626
|
13.3.1-1 baseline
Former-commit-id: cabc8cf8b4 [formerly 0563d7ac18 [formerly 841b0cf38549666c4f65f0d0cff3b92d76c9e795]]
Former-commit-id: 0563d7ac18
Former-commit-id: 96768407a5
|
2013-02-21 09:36:59 -05:00 |
|
Steve Harris
|
f55ea02607
|
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 7f2b4a8092 [formerly bfd58746491d6fcefc2f0e7d33907bf095f5b818]]
Former-commit-id: 7f2b4a8092
Former-commit-id: f5bd250026
|
2013-02-21 09:25:27 -05:00 |
|
Steve Harris
|
e0406d3183
|
13.3.1-1 baseline
Former-commit-id: d2a654625f [formerly 71e8990021 [formerly 34684c71436ce4c395ea523eb34ded6792476816]]
Former-commit-id: 71e8990021
Former-commit-id: 8ae397085e
|
2013-02-20 16:19:40 -06:00 |
|