Steve Harris
8347bed50e
13.4.1-7 baseline
...
Former-commit-id: dd6304e82206bb46b0c0442d15ab5d9312d9f19f
2013-05-13 12:58:10 -04:00
Steve Harris
16fe8cc5a2
13.4.1-6 baseline
...
Former-commit-id: f30c650b1c406889c38a5f82bbeda3605adbd9a5
2013-05-07 08:47:39 -04:00
Steve Harris
4ae0e2e858
13.4.1-5 baseline
...
Former-commit-id: 2d978fe3d2cf99e04040d191e040dbcb84a60b9a
2013-05-03 09:29:14 -05:00
Steve Harris
0f76c3cbee
13.4.1-4.1 baseline (recovered lost bin directories for 13.4.1-4)
...
Former-commit-id: dca18e1b350f5424ec129b6cd0d602ceb86e119b
2013-05-03 09:20:30 -05:00
Steve Harris
7a78f8ac6e
13.4.1-4 baseline
...
Former-commit-id: 4477bad886dc7ae0418409e3bc5ebce7965b6146
2013-05-02 10:00:38 -05:00
Steve Harris
86e96f378c
13.4.1-3 baseline
...
Former-commit-id: 02412063da81fbfd3f1bbdd48700e1b1ccdeb4fd
2013-04-29 12:25:07 -05:00
Steve Harris
5ebd58a0b3
13.4.1-2 baseline
...
Former-commit-id: 8b85b1f1e96220b29e8c3b891f6df6a9633c3b4d
2013-04-24 17:22:10 -05:00
Steve Harris
00332e6305
13.4.1-1 baseline
...
Former-commit-id: c03222bb480d87c05982b4d49f863e615b5b5584
2013-04-24 17:15:55 -05:00
Steve Harris
e6d37f3e6d
Merge branch 'master_13.3.1' into master_13.4.1
...
Former-commit-id: 59bd064351a843fd514514de9dc942d13c6d7793
2013-04-15 09:34:45 -05:00
Steve Harris
446bec6f49
13.3.1-20 baseline
...
Former-commit-id: 91210030e50e7a19c3d8d4c9d377494de2bc83dd
2013-04-15 08:58:59 -05:00
Steve Harris
abaf9f12f9
13.3.1-19 baseline
...
Former-commit-id: ce855032b2b7235b2aea8dc66aff89ca7c54854a
2013-04-09 08:37:12 -05:00
Steve Harris
d98a119f4d
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: 735ce03302b54116c8545daf043585fb16fabd11
2013-04-04 11:12:22 -05:00
Steve Harris
33bd359cfe
13.2.1-21 baseline
...
Former-commit-id: f80eddbb15e5ca1710c15d245957345d6f840546
2013-04-03 18:08:41 -04:00
Steve Harris
539faf0a71
13.2.1-20 baseline
...
Former-commit-id: 901c37ddfaeb0103160d0bbb2f1c2f623a16f73e
2013-04-03 18:05:39 -04:00
Steve Harris
ce6a06a7e3
13.3.1-18 baseline
...
Former-commit-id: 245ab5d951a10e74aba53b036001316e1c7653fe
2013-04-03 14:58:29 -05:00
Steve Harris
a3fe998f8f
13.3.1-17 baseline
...
Former-commit-id: 0eb0081dbf1af625ca75e98ab775247c924c3527
2013-04-01 12:04:56 -05:00
Steve Harris
3066dd33e5
13.3.1-16 baseline
...
Former-commit-id: 18321f88c2efedf141b84e7de18c200e1037f740
2013-04-01 11:39:08 -05:00
Steve Harris
3d8ed484be
13.3.1-15 baseline
...
Former-commit-id: 369cf4feaee63c96725cb6efc5774b8f6b8cbf08
2013-04-01 11:33:20 -05:00
Steve Harris
fc859547f8
13.2.1-19 baseline
...
Former-commit-id: 541273ef3aa42ea81b9b51ad1b4e7a9198b816b7
2013-04-01 10:11:24 -04:00
Steve Harris
4d4234d5c9
13.3.1-14 baseline
...
Former-commit-id: e05ab5dbc442d410ae53400f087c02197ba5068b
2013-03-27 22:10:03 -05:00
Steve Harris
9fba973fd0
13.3.1-14 baseline
...
Former-commit-id: 0b52508caf520abeba4a75d38c9ed9130cc12c9e
2013-03-27 17:59:34 -05:00
Steve Harris
c65f3e68e5
13.3.1-13 baseline
...
Former-commit-id: 9c263e3ffc35677d7015158e06b64f376e7f801d
2013-03-26 12:43:07 -05:00
Steve Harris
aaac0b51e5
13.3.1-12 baseline
...
Former-commit-id: 1f109861760e5fbc9d7a13cc4f518341cbc31276
2013-03-25 13:27:13 -05:00
Steve Harris
373d13df39
13.3.1-11 baseline
...
Former-commit-id: 81effd422de0285d345ebfd5c472c924ce261815
2013-03-25 13:20:03 -05:00
Steve Harris
7078eec1b1
13.3.1-10 baseline
...
Former-commit-id: b48761e6f964bc7448439c1b69f85d75593ef90d
2013-03-20 15:53:01 -05:00
Steve Harris
f52a716b3f
13.2.1-18 baseline
...
Former-commit-id: aaef550ed7b6715c68b755514ceb504a9a9e9453
2013-03-20 16:46:35 -04:00
Steve Harris
f2b3fddfe2
13.3.1-9 baseline
...
Former-commit-id: 17276903ed005e17165649f236e6a99afa47b7fb
2013-03-19 14:22:56 -05:00
Steve Harris
c15b3ffe20
13.3.1-8 baseline
...
Former-commit-id: 2d0992b2b764d9ba87c69e6e053dc7fea0e4dcc6
2013-03-18 15:43:32 -05:00
Steve Harris
e3e250c817
13.2.1-17 baseline
...
Former-commit-id: 1530bd69d5e34c81edae099c0670ae3899c94d1e
2013-03-18 13:01:37 -04:00
Steve Harris
ef031e34df
13.2.1-16 baseline
...
Former-commit-id: e40b78e021afdc0d3775c7bd3720aee81b58133a
2013-03-18 12:57:34 -04:00
Steve Harris
7617a2437f
13.2.1-15 baseline
...
Former-commit-id: a6d7a7ca85cc185d9cd3394a6e6e82f72b8f70fc
2013-03-18 12:53:04 -04:00
Steve Harris
af22cfad98
13.2.1-14 baseline
...
Former-commit-id: 101c9de4e57be6c25dab4f1e6d9158a33ca89005
2013-03-18 12:46:46 -04:00
Steve Harris
e12ed113ae
13.3.1-7 baseline
...
Former-commit-id: aa42eb84d41a7f0577ab8ce8555c0922833f96f1
2013-03-13 09:50:28 -05:00
Steve Harris
a062803c8c
13.3.1-6.1 baseline
...
Former-commit-id: 0ad794c98700f44b15933de48224ed2a822fd78f
2013-03-13 08:28:26 -05:00
Steve Harris
566b677d09
13.3.1-6 baseline
...
Former-commit-id: fecc19685d09be66f3eeeee392e565a1ce8b7e65
2013-03-12 08:35:45 -05:00
Steve Harris
94fa707724
13.2.1-13 baseline
...
Former-commit-id: 54d1ecdf86e471b984eb4a74d42d03145ae067d0
2013-03-11 11:55:20 -04:00
Steve Harris
de136aad72
13.2.1-12 baseline
...
Former-commit-id: 6316b9db6cbf29e0038128763d2ad86b1b7abae8
2013-03-07 13:43:04 -05:00
Steve Harris
e26f7eb151
13.3.1-5 baseline
...
Former-commit-id: 97fafc60d9327ab3ea3f72266113c8f5e122a275
2013-03-05 10:47:06 -06:00
Steve Harris
2edca90902
13.3.1-4 baseline
...
Former-commit-id: 572c500b0c67d72405bdf533c43c68b1955ae90e
2013-03-05 10:39:59 -06:00
Steve Harris
0684d77845
13.2.1-11 baseline
...
Former-commit-id: 9e9758e833caa408d168a5de2fe35be8e5451051
2013-03-04 17:34:39 -05:00
Steve Harris
db761c0f19
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
8a64f142e5
13.3.1-3 baseline
...
Former-commit-id: dc9e245f83eb0136157f8ca71f80f7fb9eb04796
2013-02-25 10:24:53 -05:00
Steve Harris
3d115ed3be
13.3.1-2 baseline
...
Former-commit-id: 09fb11f28bef2c3cd8fb3bfe1b2fe88f3b30af6e
2013-02-25 10:18:36 -05:00
Steve Harris
acf2f8ff92
13.2.1-10 baseline
...
Former-commit-id: 9880bba4c4a0fd8d3352036294745b5b9c0aa7d3
2013-02-25 10:11:00 -05:00
Steve Harris
cabc8cf8b4
13.3.1-1 baseline
...
Former-commit-id: 841b0cf38549666c4f65f0d0cff3b92d76c9e795
2013-02-21 09:36:59 -05:00
Steve Harris
2f7bf90856
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
d2a654625f
13.3.1-1 baseline
...
Former-commit-id: 34684c71436ce4c395ea523eb34ded6792476816
2013-02-20 16:19:40 -06:00
Steve Harris
d6dc4694f0
13.2.1-9 baseline
...
Former-commit-id: 915d8edd4670b38df0474de72cf19c6d8b9aa1a3
2013-02-20 14:11:20 -05:00
Steve Harris
b29c0b805f
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
053156f02e
13.2.1-8 baseline
...
Former-commit-id: f64f1b68b75f4903ab4bb7f7d60bbe4f1f59c669
2013-02-18 09:09:41 -06:00
