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: d63f741ab58cd4f17cd4
2012-09-28 11:43:03 -05:00
Roger Ferrel
fa0913508c
Issue #1196 Added isDisposed to CaveJFACEDialog.
...
Change-Id: I6ad1c3e1ba9015d87d04603a30ac8d02bb36abe5
Former-commit-id: bfd519cefed1e52778db
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: b3cd481696031fabe87a
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: 471bab81726cd9792f46
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: 14eb99add7045297e677
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: a71dac6cad91e39617cb
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: ec2d211800f7182ae9c7
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: 1b406ecfcab69d2cad1c
2012-08-20 14:47:14 -05:00
root
0987fc6b3d
Merge 12.9.1-4 into development_on_ss_builds
...
Former-commit-id: 5a453ee984cb46f57879
2012-08-15 22:15:20 +00:00
Ben Steffensmeier
e8524301b5
Issue #1065 fix contexts to deactivate when unrecognized views activate.
...
Former-commit-id: 4203807a776d9d0a406f
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: 0857d971b5a4c46c7f55
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: 1b3d6560e4c0dad4432c
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: 8984b35ff8ea0c7046af
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: 9071334fe90cf7d64cf4
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: 98c2ec7dc59bbb68a547
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: 668838364d84ae717563
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: b87b66abc5a33740e915
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: 130692aefdd0b06374e9
2012-06-21 16:07:20 -05:00
Steve Harris
62cf6a9f92
Revert "12.6.1-10 baseline"
...
This reverts commit 06f1c7b73cddde63eee0a2c0893d1a25198a5cd6b4b1f6975f
2012-06-21 08:51:08 -05:00
Steve Harris
06f1c7b73c
12.6.1-10 baseline
...
Former-commit-id: a2c0893d1addde63eee0
2012-06-21 08:38:48 -05:00
Max Schenkelberg
51c2a41e68
Issue #697 added support for multiple editors
...
Change-Id: Ic3ac12bb9368f0ec54dd8151ba1876002ff44e82
Former-commit-id: fceef3c5a1dd99479eeb
2012-06-13 17:52:11 -05:00
Matt Nash
3689ed489e
Issue #659 fix floating view issue when minimize happened
...
Former-commit-id: b65a0f124e96bf8b356a
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: 48860df6902f20a86a30
2012-06-12 14:37:12 -05:00
Steve Harris
09f73b0601
12.6.1-5 baseline
...
Former-commit-id: 8947efbc7fc99afab05f
2012-06-11 16:23:47 -05:00
Matt Nash
5accda84c9
Issue #659 make fixes to float/dock
...
Former-commit-id: 1f54c2d09dcc5c172a77
2012-06-11 10:21:40 -05:00
Steve Harris
8552902906
12.5.1-15 baseline
...
Former-commit-id: 3904c4ccf5b13cbb7e00
2012-06-08 13:39:48 -05:00
Matt Nash
373db85359
Issue #659 toolbar is in session view now
...
Former-commit-id: e43fee448300f55c1d80
2012-06-05 13:25:36 -05:00
Matt Nash
2b1ce9e674
Issue #659 float button for cool detachable functionality
...
Former-commit-id: cab515cbfd855193aa77
2012-05-30 16:13:21 -05:00
Steve Harris
df80148db6
12.5.1-6 baseline
...
Former-commit-id: fa87dc6cf124474489f9
2012-05-16 16:41:22 -05:00
Nate Jensen
7abedf8904
Issue #590 fix issue when exiting GFE
...
Change-Id: I6dd72855e80a49be5735f9d805fbc42e42c7f157
Former-commit-id: c92f9ee70575754040cb
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: 1f5abc6e2078e1bd2c62
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: 58037cb5d127bc369818
2012-05-09 13:14:00 -05:00
Steve Harris
ac708c050d
12.5.1-2 baseline
...
Former-commit-id: b36c69cc6784d191e7b6
2012-05-03 19:17:13 -05:00
Steve Harris
4ec294b525
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
used git cherry-pick -m 1 879a2e0
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Conflicts:
ncep/gov.noaa.nws.ncep.viz.rsc.mosaic/src/gov/noaa/nws/ncep/viz/rsc/mosaic/rsc/RadarRadialResource.java
ncep/gov.noaa.nws.ncep.viz.rsc.ncradar/src/gov/noaa/nws/ncep/viz/rsc/ncradar/rsc/RadarImageResource.java
Former-commit-id: 7b75b781ad2ed7249613
2012-05-01 18:31:09 -05:00
Steve Harris
4bfbdad17d
12.4.1-10 baseline
...
Former-commit-id: 8485b90ff89f8cb727a5
2012-05-01 18:06:13 -05:00
Steve Harris
418489e726
12.4.1-10 baseline
...
Former-commit-id: 01457fbbde704b75e1a1
2012-04-24 15:38:29 -05:00
Steve Harris
63f11892e8
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 625cd4262c4d7572a632
2012-04-19 11:11:02 -05:00
Steve Harris
750b7543dd
12.4.1-4 baseline
...
Former-commit-id: 2a216f333c67a5a68300
2012-04-18 15:18:16 -05:00
Max Schenkelberg
a5fa19c914
Issue #239 Fixed D2D context activation so as not to override important
...
keys when a unrelated view is active such as Product Browser or
Collaboration views.
Former-commit-id: 6812c1ba2bcbe92bdf32
2012-04-06 10:23:24 -05:00
Max Schenkelberg
48ca9ca105
Issue #239 Added remote capability injection code through factory
...
method. Cleaned up old/unmaintained 3D references
Former-commit-id: 16056d53c554aaf05209
2012-04-05 13:52:20 -05:00
Max Schenkelberg
c56707c6bc
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: 753de872e023d65caf2e
2012-04-02 16:15:21 -05:00
Steve Harris
a4e4792bb5
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: 5cdda77afbd3ad6095b7
2012-03-30 09:50:48 -05:00
Nate Jensen
202bd0adf8
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: aa000b4b06d2d3a245b3
2012-03-29 10:44:08 -05:00
Max Schenkelberg
8fb7eccb73
Issue #358 Cleaned up mesh extension and API to use geotools for
...
defining a mesh. This is better practice than using arbitrary
MathTransform objects as it is well defined and allows for serialization
of the mesh to occur.
Former-commit-id: 50765e8a346e5964df9d
2012-03-14 09:49:32 -05:00
Max Schenkelberg
18805c68f7
Issue #358 Merging core drawing API improvements from Collaboration
...
Former-commit-id: 89f603f448d43b0456d8
2012-03-09 12:31:50 -06:00
Max Schenkelberg
e2cd95d3f4
Issue #358 Committing NPP core rendering improvements merged with Thin
...
Client core improvements
Former-commit-id: 48b6d45f00ae47d9683e
2012-03-01 16:59:40 -06:00
Steve Harris
d971880b98
Merge branch '10-Tech_Blocked' into 104-integration
...
Conflicts:
edexOsgi/build.edex/deploy-install.xml
rpms/awips2.edex/Installer.edex-cots/component.spec
Former-commit-id: 5e9d2dd367cabf9fd956
2012-02-20 13:03:39 -06:00
Steve Harris
a2fd2cf6fa
Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked
...
Former-commit-id: d02529fef46a064cb78b
2012-02-20 12:54:25 -06:00
Steve Harris
c209d6de36
Manual merge of SS OB12.1.2-4 changes into ss_sync
...
Former-commit-id: b13730280293f6535bd8
2012-02-17 10:55:02 -06:00
Steve Harris
46dda7b8bd
Merge branch '4-Thin_Client' into 104-integration
...
Former-commit-id: 2e29bc8ee22119a1513e
2012-02-14 15:54:46 -06:00
