Steve Harris
|
dee685e3c7
|
13.4.1-14 baseline
Former-commit-id: c749e122eb [formerly 0e4ca3ea4159ea0256e22f9814f0de85180a41fb]
Former-commit-id: 18b90226a2
|
2013-06-06 15:15:27 -04:00 |
|
Steve Harris
|
b58cf237bf
|
13.4.1-13 baseline
Former-commit-id: 87b9712009 [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]
Former-commit-id: de476791fb
|
2013-05-29 16:30:09 -04:00 |
|
Steve Harris
|
bd4f93e859
|
13.4.1-12 baseline
Former-commit-id: 6a97b4325a [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]
Former-commit-id: e53ada66b8
|
2013-05-22 16:42:39 -04:00 |
|
Steve Harris
|
6df093ef48
|
13.4.1-11 baseline
Former-commit-id: 2edee36158 [formerly e414ae01ab52b3940647e46e22bba3b89790c142]
Former-commit-id: c0376ce9ed
|
2013-05-21 09:19:25 -04:00 |
|
Steve Harris
|
b1fc4e625b
|
13.4.1-10 baseline
Former-commit-id: 9a403b3615 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]
Former-commit-id: 92152778b9
|
2013-05-20 10:52:47 -04:00 |
|
Steve Harris
|
0766ae20dd
|
13.4.1-9 baseline
Former-commit-id: bcf7f15c90 [formerly 36d440ad0cc3019fd7274b6cee81b7f6a6ea2375]
Former-commit-id: aff41713f9
|
2013-05-16 11:12:07 -04:00 |
|
Steve Harris
|
a1c4cd2a39
|
13.4.1-8 baseline
Former-commit-id: 19866e7032 [formerly d130c847d4f9d0b491f9326c8b5140fb59174927]
Former-commit-id: c59b52a266
|
2013-05-14 09:21:41 -04:00 |
|
Steve Harris
|
b35027f661
|
13.4.1-7 baseline
Former-commit-id: 4c6ff79e71 [formerly dd6304e82206bb46b0c0442d15ab5d9312d9f19f]
Former-commit-id: 8347bed50e
|
2013-05-13 12:58:10 -04:00 |
|
Steve Harris
|
979700c302
|
13.4.1-6 baseline
Former-commit-id: 8379977673 [formerly f30c650b1c406889c38a5f82bbeda3605adbd9a5]
Former-commit-id: 16fe8cc5a2
|
2013-05-07 08:47:39 -04:00 |
|
Steve Harris
|
aa4624c58f
|
13.4.1-5 baseline
Former-commit-id: 85bbf6d242 [formerly 2d978fe3d2cf99e04040d191e040dbcb84a60b9a]
Former-commit-id: 4ae0e2e858
|
2013-05-03 09:29:14 -05:00 |
|
Steve Harris
|
99a7521fd6
|
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
Former-commit-id: 1a6fd7edfd [formerly dca18e1b350f5424ec129b6cd0d602ceb86e119b]
Former-commit-id: 0f76c3cbee
|
2013-05-03 09:20:30 -05:00 |
|
Steve Harris
|
7828293d32
|
13.4.1-4 baseline
Former-commit-id: d33e5861aa [formerly 4477bad886dc7ae0418409e3bc5ebce7965b6146]
Former-commit-id: 7a78f8ac6e
|
2013-05-02 10:00:38 -05:00 |
|
Steve Harris
|
8a41dd2048
|
13.4.1-3 baseline
Former-commit-id: 54afedf617 [formerly 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd]
Former-commit-id: 86e96f378c
|
2013-04-29 12:25:07 -05:00 |
|
Steve Harris
|
99bc8c8072
|
13.4.1-2 baseline
Former-commit-id: 52f0ae4758 [formerly 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d]
Former-commit-id: 5ebd58a0b3
|
2013-04-24 17:22:10 -05:00 |
|
Steve Harris
|
4accbb80db
|
13.4.1-1 baseline
Former-commit-id: 2f517b7713 [formerly c03222bb480d87c05982b4d49f863e615b5b5584]
Former-commit-id: 00332e6305
|
2013-04-24 17:15:55 -05:00 |
|
Steve Harris
|
ad51361408
|
Merge branch 'master_13.3.1' into master_13.4.1
Former-commit-id: 7957c52dec [formerly 59bd064351a843fd514514de9dc942d13c6d7793]
Former-commit-id: e6d37f3e6d
|
2013-04-15 09:34:45 -05:00 |
|
Steve Harris
|
4b71131386
|
13.3.1-20 baseline
Former-commit-id: 25432cc388 [formerly 91210030e50e7a19c3d8d4c9d377494de2bc83dd]
Former-commit-id: 446bec6f49
|
2013-04-15 08:58:59 -05:00 |
|
Steve Harris
|
340a2cfb23
|
13.3.1-19 baseline
Former-commit-id: 9be238bcc4 [formerly ce855032b2b7235b2aea8dc66aff89ca7c54854a]
Former-commit-id: abaf9f12f9
|
2013-04-09 08:37:12 -05:00 |
|
Steve Harris
|
1a91fd82ff
|
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: ea34b1db1e [formerly 735ce03302b54116c8545daf043585fb16fabd11]
Former-commit-id: d98a119f4d
|
2013-04-04 11:12:22 -05:00 |
|
Steve Harris
|
18d6fa4f4d
|
13.2.1-21 baseline
Former-commit-id: d4358b93dc [formerly f80eddbb15e5ca1710c15d245957345d6f840546]
Former-commit-id: 33bd359cfe
|
2013-04-03 18:08:41 -04:00 |
|
Steve Harris
|
12d4316b3a
|
13.2.1-20 baseline
Former-commit-id: 6a55bc5dff [formerly 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e]
Former-commit-id: 539faf0a71
|
2013-04-03 18:05:39 -04:00 |
|
Steve Harris
|
bf6c3b6762
|
13.3.1-18 baseline
Former-commit-id: a2b098d86d [formerly 245ab5d951a10e74aba53b036001316e1c7653fe]
Former-commit-id: ce6a06a7e3
|
2013-04-03 14:58:29 -05:00 |
|
Steve Harris
|
4afa41d4e7
|
13.3.1-17 baseline
Former-commit-id: 7bf9966dcb [formerly 0eb0081dbf1af625ca75e98ab775247c924c3527]
Former-commit-id: a3fe998f8f
|
2013-04-01 12:04:56 -05:00 |
|
Steve Harris
|
36a4b3eb51
|
13.3.1-16 baseline
Former-commit-id: 51380726d4 [formerly 18321f88c2efedf141b84e7de18c200e1037f740]
Former-commit-id: 3066dd33e5
|
2013-04-01 11:39:08 -05:00 |
|
Steve Harris
|
d3cec5d3cb
|
13.3.1-15 baseline
Former-commit-id: eb1dab3864 [formerly 369cf4feaee63c96725cb6efc5774b8f6b8cbf08]
Former-commit-id: 3d8ed484be
|
2013-04-01 11:33:20 -05:00 |
|
Steve Harris
|
a83eddfe7b
|
13.2.1-19 baseline
Former-commit-id: bebd9ad1f4 [formerly 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7]
Former-commit-id: fc859547f8
|
2013-04-01 10:11:24 -04:00 |
|
Steve Harris
|
c0737a6022
|
13.3.1-14 baseline
Former-commit-id: c29076949e [formerly e05ab5dbc442d410ae53400f087c02197ba5068b]
Former-commit-id: 4d4234d5c9
|
2013-03-27 22:10:03 -05:00 |
|
Steve Harris
|
2ca160caf0
|
13.3.1-14 baseline
Former-commit-id: 9022c500ce [formerly 0b52508caf520abeba4a75d38c9ed9130cc12c9e]
Former-commit-id: 9fba973fd0
|
2013-03-27 17:59:34 -05:00 |
|
Steve Harris
|
822d05a709
|
13.3.1-13 baseline
Former-commit-id: c77a452f5a [formerly 9c263e3ffc35677d7015158e06b64f376e7f801d]
Former-commit-id: c65f3e68e5
|
2013-03-26 12:43:07 -05:00 |
|
Steve Harris
|
bc439aee4f
|
13.3.1-12 baseline
Former-commit-id: 0be473728a [formerly 1f109861760e5fbc9d7a13cc4f518341cbc31276]
Former-commit-id: aaac0b51e5
|
2013-03-25 13:27:13 -05:00 |
|
Steve Harris
|
d868003067
|
13.3.1-11 baseline
Former-commit-id: 9cdd90e382 [formerly 81effd422de0285d345ebfd5c472c924ce261815]
Former-commit-id: 373d13df39
|
2013-03-25 13:20:03 -05:00 |
|
Steve Harris
|
7c2e617d26
|
13.3.1-10 baseline
Former-commit-id: 073687d9a9 [formerly b48761e6f964bc7448439c1b69f85d75593ef90d]
Former-commit-id: 7078eec1b1
|
2013-03-20 15:53:01 -05:00 |
|
Steve Harris
|
72edfa459b
|
13.2.1-18 baseline
Former-commit-id: 3fd5612f89 [formerly aaef550ed7b6715c68b755514ceb504a9a9e9453]
Former-commit-id: f52a716b3f
|
2013-03-20 16:46:35 -04:00 |
|
Steve Harris
|
0375805e79
|
13.3.1-9 baseline
Former-commit-id: 468ae82305 [formerly 17276903ed005e17165649f236e6a99afa47b7fb]
Former-commit-id: f2b3fddfe2
|
2013-03-19 14:22:56 -05:00 |
|
Steve Harris
|
5f492500ea
|
13.3.1-8 baseline
Former-commit-id: f97d78994b [formerly 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6]
Former-commit-id: c15b3ffe20
|
2013-03-18 15:43:32 -05:00 |
|
Steve Harris
|
6bfab62991
|
13.2.1-17 baseline
Former-commit-id: 43aa54dc4c [formerly 1530bd69d5e34c81edae099c0670ae3899c94d1e]
Former-commit-id: e3e250c817
|
2013-03-18 13:01:37 -04:00 |
|
Steve Harris
|
7915f0ce01
|
13.2.1-16 baseline
Former-commit-id: a75fe06bfe [formerly e40b78e021afdc0d3775c7bd3720aee81b58133a]
Former-commit-id: ef031e34df
|
2013-03-18 12:57:34 -04:00 |
|
Steve Harris
|
29c9d5a170
|
13.2.1-15 baseline
Former-commit-id: 7b52d3eb6e [formerly a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc]
Former-commit-id: 7617a2437f
|
2013-03-18 12:53:04 -04:00 |
|
Steve Harris
|
d8775866a6
|
13.2.1-14 baseline
Former-commit-id: 00ce32ea21 [formerly 101c9de4e57be6c25dab4f1e6d9158a33ca89005]
Former-commit-id: af22cfad98
|
2013-03-18 12:46:46 -04:00 |
|
Steve Harris
|
31c0a97dca
|
13.3.1-7 baseline
Former-commit-id: a72254cc75 [formerly aa42eb84d41a7f0577ab8ce8555c0922833f96f1]
Former-commit-id: e12ed113ae
|
2013-03-13 09:50:28 -05:00 |
|
Steve Harris
|
bfa25f3330
|
13.3.1-6.1 baseline
Former-commit-id: fa9d260c2b [formerly 0ad794c98700f44b15933de48224ed2a822fd78f]
Former-commit-id: a062803c8c
|
2013-03-13 08:28:26 -05:00 |
|
Steve Harris
|
4ed21b702b
|
13.3.1-6 baseline
Former-commit-id: 3a4c7931e1 [formerly fecc19685d09be66f3eeeee392e565a1ce8b7e65]
Former-commit-id: 566b677d09
|
2013-03-12 08:35:45 -05:00 |
|
Steve Harris
|
0706fce85c
|
13.2.1-13 baseline
Former-commit-id: 088e318fda [formerly 54d1ecdf86e471b984eb4a74d42d03145ae067d0]
Former-commit-id: 94fa707724
|
2013-03-11 11:55:20 -04:00 |
|
Steve Harris
|
e71ef2b835
|
13.2.1-12 baseline
Former-commit-id: 23a41ad607 [formerly 6316b9db6cbf29e0038128763d2ad86b1b7abae8]
Former-commit-id: de136aad72
|
2013-03-07 13:43:04 -05:00 |
|
Steve Harris
|
a40c9136fe
|
13.3.1-5 baseline
Former-commit-id: a89221c75b [formerly 97fafc60d9327ab3ea3f72266113c8f5e122a275]
Former-commit-id: e26f7eb151
|
2013-03-05 10:47:06 -06:00 |
|
Steve Harris
|
5e55ded3a9
|
13.3.1-4 baseline
Former-commit-id: 8c0b90f292 [formerly 572c500b0c67d72405bdf533c43c68b1955ae90e]
Former-commit-id: 2edca90902
|
2013-03-05 10:39:59 -06:00 |
|
Steve Harris
|
9cc1613b50
|
13.2.1-11 baseline
Former-commit-id: 41dc7c0396 [formerly 9e9758e833caa408d168a5de2fe35be8e5451051]
Former-commit-id: 0684d77845
|
2013-03-04 17:34:39 -05:00 |
|
Steve Harris
|
62e15dacdb
|
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: cf951785c8 [formerly 8c1e3bc2413a6e1e6644f8ba8812edf591557f29]
Former-commit-id: db761c0f19
|
2013-02-25 15:54:24 -06:00 |
|
Steve Harris
|
8d741715e3
|
13.3.1-3 baseline
Former-commit-id: 6572452887 [formerly dc9e245f83eb0136157f8ca71f80f7fb9eb04796]
Former-commit-id: 8a64f142e5
|
2013-02-25 10:24:53 -05:00 |
|
Steve Harris
|
e8a51dc780
|
13.3.1-2 baseline
Former-commit-id: df6d6f598e [formerly 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e]
Former-commit-id: 3d115ed3be
|
2013-02-25 10:18:36 -05:00 |
|