Commit graph

76 commits

Author SHA1 Message Date
Max Schenkelberg
56ae27e172 Issue #1328 Cleaned up time matching API for GFE use. Removed notion of time match basis from AbstractTimeMatcher and moved code using it into D2D specific plugins
Amend: Added back in TimeMatchBasisCapability.  Someday will need to figure out bundle migration since this unused class can never die

Change-Id: I3086daa43e553202565e2b88f455d4dd0bfc65f6

Former-commit-id: ed77d56a84 [formerly fa693a9bb802af2491c70c14aa7ab33485fb4915]
Former-commit-id: b648c5828e
2012-11-29 10:29:36 -06:00
Mike Duff
4e15f63b4e Issue #728 - Implementation of Statistics graphs
peer review comments
Changing to use average value rather than sum.

Change-Id: I7f97e27c4f463fe60bec2cbc52f3eac66d8fa77f

Former-commit-id: f000c1a9cf [formerly f15ba1ee009abf4a562bb37450d65f97c7ffa217]
Former-commit-id: c49759d28e
2012-11-26 17:31:29 -06:00
Dustin Johnson
973ffa6f71 Issue #1322 Add IDisplay
Change-Id: I0f20b5e2e4544c2a984c317a812855f92e935b92

Former-commit-id: d68c1f84f2 [formerly 039c475445ca8f049c46547dba63d413f3019817]
Former-commit-id: 4425d25c71
2012-11-20 15:22:52 -06:00
Roger Ferrel
e3ae2eb355 Issue #1298 Change CaveJFACEDialog's open method to work similar to CaveSWTDialog's open.
Change-Id: I5e4cf98b98df3571a94407f2d677766b209d4081

Former-commit-id: 4c3af2a258 [formerly 4da71d30d62eeeee3546c3019850e77cab757c78]
Former-commit-id: 22f8bc10f0
2012-11-13 12:55:33 -06:00
Dustin Johnson
efd3d3735a Issue #1302 Address peer review comments for 5-Data_Delivery/development merge
Amend:
  More peer review comments
  Restore PreferencesHandler

Change-Id: Ib995f58c31ce844466674dbe29bf3048b78048f7

Former-commit-id: 1dbeb22893 [formerly c04f7dca6f980ab7f3d77825312ddc34ba3b188d]
Former-commit-id: 064ef82d1e
2012-11-08 09:57:16 -06:00
Dustin Johnson
8e69107b5a Issue #1302 Merge branch '5-Data_Delivery' into development
Conflicts:
    edexOsgi/build.edex/deploy-common/external-rules.xml
    edexOsgi/build.edex/deploy-common/plugin-methods.xml
    edexOsgi/com.raytheon.edex.plugin.text/src/com/raytheon/edex/plugin/text/dao/TextDao.java
    edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
    edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/Executor.java
    edexOsgi/build.edex/build.xml
    edexOsgi/build.edex/esb/conf/modes.xml
    edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
    edexOsgi/com.raytheon.edex.plugin.grib/res/spring/grib-ingest.xml
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/Grib1Decoder.java
    edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/GribDecoder.java
    edexOsgi/com.raytheon.uf.common.gridcoverage/src/com/raytheon/uf/common/gridcoverage/GridCoverage.java

Change-Id: I32226e8c316eb393d6f372eaa53b8811d0a954a0

Former-commit-id: 31d7d09c10 [formerly 89583d97c8823818f87dc1a234078d85ba7bea4a]
Former-commit-id: 98d7beae50
2012-11-01 13:36:06 -05:00
Roger Ferrel
9a5a87635a Issue #1229 Changes for non-blocking CaveSWTWizardDlg.
Change-Id: I2ce93910b6605e5527c321f594bd0a03b13f321d

Former-commit-id: 314af882c6 [formerly 30b387dc4c5392263ba3e82bca1db64099684ecf]
Former-commit-id: ae3fb5eef5
2012-10-22 14:07:18 -05:00
Roger Ferrel
602c6d8d2e Issue #1229 Changes for non-blocking ViewMessagesDialog.
Change-Id: Id1bd1e36a2d16feec60c82997891577c98296fe7

Former-commit-id: e157187c72 [formerly 02e781832ab07685baf2b353df39e156a3190c2c]
Former-commit-id: 763c6ea58c
2012-10-22 10:25:05 -05:00
Roger Ferrel
e17d8d4c37 Issue #1229 Changes for non-blocking SWTMessageBox.
Change-Id: Id9954878c2764f4527e85b958a0fec7a05548db9

Former-commit-id: 38ae2b122e [formerly b073d27b36543630e3fd04623e22cd5242e5ed1f]
Former-commit-id: 610444ee88
2012-10-18 14:06:02 -05:00
Roger Ferrel
abd0476b6a Issue #1229 Changes for non-blocking SetTimeDialog.
Change-Id: I0a5d497a29b5a6e9e7441e130ce081058e78f4e3

Former-commit-id: 4cd2f1c851 [formerly 5e4edda802714c236334500a12c2020386770dd2]
Former-commit-id: 40fb3f9729
2012-10-18 07:36:31 -05:00
Roger Ferrel
3af99829a6 Issue #1229 Changes for non-blocking LabelOffsetDialog.
Change-Id: Ic0d821549a300c53e29f4c321af3c51e22fb308e

Former-commit-id: d319101ed9 [formerly f1131f2d9d1d5e0194a65e787e2628e733563683]
Former-commit-id: 66379c3210
2012-10-17 15:12:55 -05:00
Roger Ferrel
3d15bf8be1 Issue #1229 Changes for non-blocking ImagingDialog.
Change-Id: Iddcbf248949a082f734f6b5de8d8941089746468

Former-commit-id: 460acb4337 [formerly 185024d06da214041273674716a7efce4b2a98f1]
Former-commit-id: c73acb0c30
2012-10-17 13:53:29 -05:00
Roger Ferrel
cdf5c546ab Issues #1229 Changes for non-blocking ColormapDialog.
Change-Id: I95126e4d7e0b450e014764c96caf93cdff9c2d8d

Former-commit-id: 6833c7e04c [formerly 88476b683c5c480395edacd2920e32a0589a92e5]
Former-commit-id: 8e86f32714
2012-10-17 10:20:18 -05:00
Roger Ferrel
086223e764 Issue #1229 Changes for non-blocking SaveColorMapDialog.
Change-Id: I5308c5f2ca546c825863f89162f2f1143f0431fc

Former-commit-id: 7f3ab5434c [formerly b902eadfca48628bf8944d97019263e94618667a]
Former-commit-id: 5e79024db3
2012-10-17 08:15:21 -05:00
Roger Ferrel
ac30143335 Issue #1229 Changes for non-blocking BackgroundColorDialog.
Change-Id: Ie3d72e33a33ebdd12fe0b66047fd211e049474d9

Former-commit-id: d60b4ca396 [formerly 23c93af437fa662cc7df98e69a8bd383aabbab41]
Former-commit-id: 59a2dd6a3a
2012-10-16 17:00:11 -05:00
James Korman
0bffd25bdc Issue #1229 - Issue #1229 - Change to use non-blocking.
Change-Id: I2da0ebd176f7f50d63d70aed28bfe3385ac39a48

Former-commit-id: 860bd4af04 [formerly ae8a0dcce3055931c901093e148639f959c70a97]
Former-commit-id: 7769d4cc14
2012-10-11 11:31:43 -05:00
Ron Anderson
8136beddc7 Issue #1242 Fix wierd GFE behavior when Grid Manager is maximized.
Change-Id: I2e6d6929a8a8af8dab3320bdf8cda3466fe05fa8

Former-commit-id: 8e8c713884 [formerly 4fb21077aba1dd9cfafc7f046b02f24f750c6384]
Former-commit-id: b041ccf099
2012-10-04 12:15:01 -05:00
Max Schenkelberg
eb9cd3003a Issue #1222 Fixed MapResourceGroup to manage keeping capabilties in sync with underlying resources by using listeners. Also fixed issue where you can set map resources to be time match basis to avoid errors. Fixed build when merging in 12.10
Change-Id: Iec0389be3a563df2d14f079cdd127a32ba552237

Former-commit-id: d63f741ab5 [formerly ac247423f66f1b29b2235595f08b8cee03962842]
Former-commit-id: 8cd4f17cd4
2012-09-28 11:43:03 -05:00
Roger Ferrel
fa0913508c Issue #1196 Added isDisposed to CaveJFACEDialog.
Change-Id: I6ad1c3e1ba9015d87d04603a30ac8d02bb36abe5

Former-commit-id: bfd519cefe [formerly 0eee43ff9fc99f027a295abebf64a98bbfeabe26]
Former-commit-id: d1e52778db
2012-09-27 16:31:11 -05:00
Roger Ferrel
b629d03f38 Issue #1196 Changes for Valid Period Dialog.
Changes from review.

Change-Id: I6adeb9741c0b8a6bb02525021b5c5b0b75ea43ee

Former-commit-id: b3cd481696 [formerly 2d73c05dcff07658fc1bcd9ab878a9bca73b4aa3]
Former-commit-id: 031fabe87a
2012-09-27 10:40:47 -05:00
Roger Ferrel
6fa8e82174 Issue #1196 Changes for WmoIdSelectiondialog and modification to CaveJFACEDialog's setBlockOnOpen.
Change-Id: I3b9cc2bdc32a8f82a2d9ca6927c7fcda02254e9a

Former-commit-id: 471bab8172 [formerly 54e670d97751f1f78d472d742c4f362c7deee625]
Former-commit-id: 6cd9792f46
2012-09-20 12:14:42 -05:00
Lee Venable
6ac7e90550 Issue #1165 : initial update for the dialog refactor.
Issue #1165 - added JFACE code update.

Issue #1165 - changed method names.
Change-Id: I4fab0a7c1384a4f3e5f66a9daf90027d39421110

Former-commit-id: 14eb99add7 [formerly 687a13eb43abd6ff17b3aa82f2a0265159f5e6cc]
Former-commit-id: 045297e677
2012-09-14 08:39:38 -05:00
Steve Harris
51eb89eb2a Merge branch 'development_on_ss_builds' (with 12.9.1-5) into development
Conflicts:
	cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGribGridResource.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelDataRequestJob.java
	cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/PlotModelGeneratorJob.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/config/DbPointSourceDataAdaptor.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/AbstractWarningResource.java
	edexOsgi/com.raytheon.uf.common.geospatial/src/com/raytheon/uf/common/geospatial/interpolation/data/UnsignedByteArrayWrapper.java

Former-commit-id: a71dac6cad [formerly b9db13cf5bff60511d815f92f0239a4313498265]
Former-commit-id: 91e39617cb
2012-08-27 09:53:55 -05:00
David Gillingham
f3a33e3df4 Issue #1087: Enable DRT for CAVE operational mode.
Change-Id: I8d9992b2fd5b6ddaec447ee70869124d1d76a4d9

Former-commit-id: ec2d211800 [formerly 3f3c778d6f3c5ced13f778746c6a9a46f72c396c]
Former-commit-id: f7182ae9c7
2012-08-23 11:21:23 -05:00
Max Schenkelberg
fc06265360 Issue #28 Cleaned up True Color code and removed old MultiChannel code. Adding capping index back to indexing.glsl and added no data value to ColorMapParameters that should be used for finding no data values in shader and in java. True color dialog was written but not hooked in yet as need to still think about single resource tied to multiple channels and serializing changes.
Change-Id: I20bff443fe4c9b9330c0a66779218227c48df014

Former-commit-id: 1b406ecfca [formerly 564b38b30562a371cf0345de572b32ea8f53e82e]
Former-commit-id: b69d2cad1c
2012-08-20 14:47:14 -05:00
root
0987fc6b3d Merge 12.9.1-4 into development_on_ss_builds
Former-commit-id: 5a453ee984 [formerly a178af491f4b4cd75ed1517f023354bab0b9c8c8]
Former-commit-id: cb46f57879
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e8524301b5 Issue #1065 fix contexts to deactivate when unrecognized views activate.
Former-commit-id: 4203807a77 [formerly 5046660b52594a165d4a8749ac12c236d5ec027d]
Former-commit-id: 6d9d0a406f
2012-08-15 16:36:05 -05:00
Ben Steffensmeier
474fe44037 Issue #1018 disable many toolbar and menu items when the current editor is not a display pane container
Former-commit-id: 0857d971b5 [formerly 7ae4af9778cfa58fc755041479aadec5e6ad90b0]
Former-commit-id: a4c46c7f55
2012-08-14 10:25:38 -05:00
Nate Jensen
da1e9ae3c3 Merge "Issue #808 create API for managing floating views and made CaveDetachedWindow more robust." into development
Former-commit-id: 1b3d6560e4 [formerly 80746bd2c441de92304fb1dabdcfbd66ce3f49a6]
Former-commit-id: c0dad4432c
2012-07-12 17:17:57 -05:00
Ben Steffensmeier
45a1cc1997 Issue #808 create API for managing floating views and made CaveDetachedWindow more robust.
Former-commit-id: 8984b35ff8 [formerly 1f9b6d2a0b7d45f68bda57c6fcaeec493cbb835a]
Former-commit-id: ea0c7046af
2012-07-12 13:35:52 -05:00
Roger Ferrel
bfcefac909 Issue #875 - Create com.raytheon.uf.viz.points
Amend: fixing code per review comments

Change-Id: I52249180e5a1af37854bc522ada50cc27bc24627

Former-commit-id: 9071334fe9 [formerly f3d38c3b1ea1b8118f90ce38937a689a9581b2bb]
Former-commit-id: 0cf7d64cf4
2012-07-12 11:32:03 -05:00
Max Schenkelberg
7d13c7d339 Issue #626 Moved code from NPP branch in old repo to new common/core setup. Involved adding multichannel imagery code into new baseline. Cleaning up derived parameters to support more than just FloatDataRecords as well as search the full localization hierarchy contributing derived paramters and not just base/site/user files (NPP Derived parameters are in NPP plugin, not cave etc directory where all others reside). Also removed calls to deprecated useBuiltInColorBar function
Amend: Fixed Richard's comments

Change-Id: Ie406098bbc73fe6bf53bfb9bb103d7422c6c57d3

Former-commit-id: 98c2ec7dc5 [formerly 9d3fd9e078c9c1a2995d2f8ebe4eca757b480050]
Former-commit-id: 9bbb68a547
2012-07-06 16:01:47 -05:00
Max Schenkelberg
53fd2ec047 Issue #821 Fixed editor menu so plugin.xml action contribution items
are created every time the menu is shown to make sure any submenus are
recreated in the action.

Change-Id: I9f2103b1e8fcddc5bc790d74753733a42f9e6382

Former-commit-id: 668838364d [formerly 537240ee2e9dfb7c110f8d3a63566932b599dfdf]
Former-commit-id: 84ae717563
2012-06-28 11:53:21 -05:00
Bryan Kowal
b1b294c401 Merge branch 'ss_sync' (OB12.6.1-10) into development
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataLoader.java
	cave/com.raytheon.viz.feature.awips.developer/feature.xml
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/rsc/GFEResource.java
	edexOsgi/build.edex/deploy-install.xml
	edexOsgi/build.edex/rpm/component/edex/includes/edex-common-core/MANIFEST.MF
	edexOsgi/build.edex/rpm/component/edex/includes/edex-dataplugins/MANIFEST.MF
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.airep/src/com/raytheon/uf/common/dataplugin/airep/AirepRecord.java
	edexOsgi/com.raytheon.uf.common.hlstopo/build.properties
	edexOsgi/com.raytheon.uf.edex.pointdata/src/com/raytheon/uf/edex/pointdata/PointDataQuery.java
	rpms/awips2-rpm.db
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: b87b66abc5 [formerly af5a90e383c1c115b363a33d9e72f957ada697a4]
Former-commit-id: a33740e915
2012-06-27 17:21:48 -05:00
Max Schenkelberg
a691f425ea Issue #590 fixed context activation for GFE when non GFE views/editors are active. Generalized so any perspective can take advantage of it.
Change-Id: I98fa8bd80d2235d605f94f227490e4438ef70ca5

Former-commit-id: 130692aefd [formerly 75fb17528d393b767df8d8a34abd5e41f007b771]
Former-commit-id: d0b06374e9
2012-06-21 16:07:20 -05:00
Steve Harris
62cf6a9f92 Revert "12.6.1-10 baseline"
This reverts commit 06f1c7b73c [formerly ddde63eee0] [formerly a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]].


Former-commit-id: 25198a5cd6 [formerly 8cdb21fda317373a0dc95e5048716d0e31412ab4]
Former-commit-id: b4b1f6975f
2012-06-21 08:51:08 -05:00
Steve Harris
06f1c7b73c 12.6.1-10 baseline
Former-commit-id: a2c0893d1a [formerly 5e2f5e9bc2b0559c3101cc0c3af708858e3b95d1]
Former-commit-id: ddde63eee0
2012-06-21 08:38:48 -05:00
Max Schenkelberg
51c2a41e68 Issue #697 added support for multiple editors
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82

Former-commit-id: fceef3c5a1 [formerly 3afc7b49cb42c005a0e9cf5221e35fc3ab78007a]
Former-commit-id: dd99479eeb
2012-06-13 17:52:11 -05:00
Matt Nash
3689ed489e Issue #659 fix floating view issue when minimize happened
Former-commit-id: b65a0f124e [formerly 82f0b55ac176aad663d7febe94c64d2982bcc45c]
Former-commit-id: 96bf8b356a
2012-06-13 10:04:12 -05:00
Steve Harris
af6c0529ad Merge branch 'ss_sync' (OB12.5.1-15) into 11-Collaboration
Conflicts:
	cave/build/p2-build.xml
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/IGraphicsTarget.java
	cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/drawables/AbstractDescriptor.java
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/map/actions/RotatePanelsHandler.java
	cave/com.raytheon.uf.viz.radar.gl/src/com/raytheon/uf/viz/radar/gl/mosaic/GLMosaicImage.java
	cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
	ncep/com.raytheon.uf.viz.ncep.core.feature/feature.xml
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/OutlookAttrDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/WatchFormatMsgDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/attrdialog/vaadialog/CcfpTimeDlg.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/file/FileTools.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProdTypeDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/productmanage/ProductConfigureDialog.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/producttypes/ProdType.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/AbstractPgenDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenTextDrawingTool.java
	ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/tools/PgenWatchBoxAddDelCntyHandler.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/conditionalfilter/ConditionalFilterHelpDialog.java

Former-commit-id: 48860df690 [formerly 9e83341a16b6e68f9bfe579dff60271553c3db82]
Former-commit-id: 2f20a86a30
2012-06-12 14:37:12 -05:00
Steve Harris
09f73b0601 12.6.1-5 baseline
Former-commit-id: 8947efbc7f [formerly 052cb99a833ed45e1d7a6e965bf8c996c39e2ffb]
Former-commit-id: c99afab05f
2012-06-11 16:23:47 -05:00
Matt Nash
5accda84c9 Issue #659 make fixes to float/dock
Former-commit-id: 1f54c2d09d [formerly 6ce7d566d2da59436b6d141ad96503873b11f1aa]
Former-commit-id: cc5c172a77
2012-06-11 10:21:40 -05:00
Steve Harris
8552902906 12.5.1-15 baseline
Former-commit-id: 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: b13cbb7e00
2012-06-08 13:39:48 -05:00
Matt Nash
373db85359 Issue #659 toolbar is in session view now
Former-commit-id: e43fee4483 [formerly a516cc2073fa33c88f13678a55dda4bdbe3ed120]
Former-commit-id: 00f55c1d80
2012-06-05 13:25:36 -05:00
Matt Nash
2b1ce9e674 Issue #659 float button for cool detachable functionality
Former-commit-id: cab515cbfd [formerly 9b1c62c4851f95ad270b58ceacf756a616f7c136]
Former-commit-id: 855193aa77
2012-05-30 16:13:21 -05:00
Steve Harris
df80148db6 12.5.1-6 baseline
Former-commit-id: fa87dc6cf1 [formerly a75af2f0de38d65dcbbd919e159c3b0a268fc245]
Former-commit-id: 24474489f9
2012-05-16 16:41:22 -05:00
Nate Jensen
7abedf8904 Issue #590 fix issue when exiting GFE
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157

Former-commit-id: c92f9ee705 [formerly 258fead57d05a908b32b0b74a2e34ab19be0947f]
Former-commit-id: 75754040cb
2012-05-11 13:58:46 -05:00
Max Schenkelberg
06ee0bbf6f Issue #588 Added serialization adapter registration to better support serializing DrawableString objects
Change-Id: I2833b345fbef4674083dcad3561444ec4e6a0056

Former-commit-id: 1f5abc6e20 [formerly 6c456c0bad00aaa1fea67f90a4633b3e14a78495]
Former-commit-id: 78e1bd2c62
2012-05-09 15:02:30 -05:00
Steve Harris
572e1bb476 Merge branch 'ss_sync' (OB12.4.1-10) into 11-Collaboration
Conflicts:
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/xml/IncludeMenuItem.java

Former-commit-id: 58037cb5d1 [formerly 8f71c807be1d604cea51ab522f04f8bbf8c11f83]
Former-commit-id: 27bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
ac708c050d 12.5.1-2 baseline
Former-commit-id: b36c69cc67 [formerly ff847bf86803a485212f08a098be13bc3d83b0b8]
Former-commit-id: 84d191e7b6
2012-05-03 19:17:13 -05:00