xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
346 commits 31 branches 40 tags 3.8 GiB
Commit graph

204 commits

Author SHA1 Message Date
Steve Harris
31353e2296 12.9.1-1 baseline 
Former-commit-id: b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly b9fb1c89d4 [formerly 8309193ce9] [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: d3023f15ac [formerly aed7a644df] [formerly b452006db8c662d7b75e89f5dcc158103aa65a9b [formerly 0c5d9e2416]]
Former-commit-id: b1b11fe00755e632d56330d48d6e1eee387eeef8 [formerly 63bcadf121]
Former-commit-id: 16d7d955fc
 2012-08-15 13:59:00 -05:00
Steve Harris
5b36559525 12.8.1-10 baseline 
Former-commit-id: 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly 79d4d91e46 [formerly 6244359a80] [formerly b5e8fee24d] [formerly ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]]
Former-commit-id: ca25d508ec
Former-commit-id: 330df3323f [formerly 78d34d65d2] [formerly ecf87b1305ff66ff4fdee1eb082f70a1ea1b736b [formerly d5563fc340]]
Former-commit-id: ec8b3d9f8a4ff2a546518a3c5769751ec3bf2a2f [formerly 46daa48f1c]
Former-commit-id: 78d66ba6df
 2012-08-06 09:34:26 -05:00
Steve Harris
1098368e19 12.8.1-5 baseline 
Former-commit-id: 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly 2e804fc8c4 [formerly 2653ddc2e3] [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]]
Former-commit-id: cd49ef3eda
Former-commit-id: 4f47148ced [formerly dab00b12e6] [formerly 470040dd3334156744a98f7368531647893ed93d [formerly e0c3722fd1]]
Former-commit-id: 573a0cc46f2d0efe2e8514f12ca675b4673c9160 [formerly e86949a8d3]
Former-commit-id: d3be09bd74
 2012-08-01 10:45:37 -05:00
Steve Harris
23dc8deeb0 12.7.1-8 baseline 
Former-commit-id: b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly b242dd98d6 [formerly 11f96dbedd] [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]]
Former-commit-id: c42ae0fa39
Former-commit-id: e1eb7f5972 [formerly f2102bfb24] [formerly 02bef853ef7c7fae6630b12e89ad4d9ef11bc391 [formerly 9f97182964]]
Former-commit-id: 8c3889c2ea3f00fe58aa1f356c175dee2c28f99c [formerly 9aabe438b9]
Former-commit-id: 36e2ad3023
 2012-07-19 16:20:40 -05:00
Steve Harris
c74431ba29 12.6.1-9 baseline 
Former-commit-id: 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 32fdf6ed3b [formerly 7c064b6868] [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]]
Former-commit-id: 27afa60345
Former-commit-id: e528bb0df2 [formerly dc50bc8443] [formerly 39c28d347eb5aeecbc48481fe6871268a89c0c2d [formerly 4f7bb90bb0]]
Former-commit-id: 38b944b7b39fc0e1e6c5f5e0171cfa20b64068e4 [formerly d5fa61041b]
Former-commit-id: 37f2b6e138
 2012-07-10 07:53:49 -05:00
Steve Harris
46068c6716 12.5.1-15 baseline 
Former-commit-id: 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 2f10c7a1e4 [formerly 8552902906] [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 1f521a70b3 [formerly 97c4db937e] [formerly 0e40eb424698bf43c230ac21347627590405fcb2 [formerly 676ea3192f]]
Former-commit-id: 5dd364497cd5da1357297a4b842e962ad3d5e006 [formerly 9054c5ab6c]
Former-commit-id: 39ff9954f8
 2012-06-08 13:39:48 -05:00
Max Schenkelberg
50caaa47a4 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e0a22310dc [formerly 2ef208b263] [formerly 3fe183277b] [formerly e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]]
Former-commit-id: e3d6962fe6
Former-commit-id: c5b45b0265 [formerly 338f80fa87] [formerly b0a578678016a097651cd359f6c7d0ad3223db18 [formerly 878de45ee6]]
Former-commit-id: 9ffb2ad0cd59863353c63a130f22384e8bd16572 [formerly 9f72069996]
Former-commit-id: 4ddcccc3c7
 2012-05-01 18:36:09 -05:00
Steve Harris
3419f72215 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: fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly fe946166ed [formerly 4ec294b525] [formerly 2ed7249613] [formerly 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 3992b18e28 [formerly 7c7fc97131] [formerly 228c26d32b0b13d4cccf51b188ca617ec417aba4 [formerly 6dd3ee8809]]
Former-commit-id: 7a3a10e1ab59cf68f5e1476abff39883afb9ef4b [formerly fd9e226b35]
Former-commit-id: 491aa53a0c
 2012-05-01 18:31:09 -05:00
Steve Harris
7f90924706 12.4.1-10 baseline 
Former-commit-id: 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 7fa9dbd5fb [formerly 4bfbdad17d] [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 40aa780b3d [formerly 33a67cdd82] [formerly 73930fb29d0c1e91204e76e6ebfdbe757414f319 [formerly a28d70b5c5]]
Former-commit-id: a16a1b4dd44fc344ee709abbe262aeed58a8339b [formerly e5543a0e86]
Former-commit-id: 0c25458510
 2012-05-01 18:06:13 -05:00
Max Schenkelberg
f0a90ad028 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 9126809973 [formerly e03ee60c75] [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 937f4b6aa3 [formerly 51a826384e] [formerly 2e1507a1308f6373329e72eb1d9ccc52bd416fb3 [formerly 65c864aff2]]
Former-commit-id: 7d5e1d641386de98262499c8ba677d6c85554bf1 [formerly 72a27b7ae0]
Former-commit-id: 33d08f1496
 2012-04-19 11:11:34 -05:00
Steve Harris
0cf19dc505 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: 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 634d40a156 [formerly 63f11892e8] [formerly 4d7572a632] [formerly 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]]
Former-commit-id: 625cd4262c
Former-commit-id: 6aa0898aae [formerly e86dc647be] [formerly f6efcfd8ee5a2a4ca8ad3ed217945853b75bfa5f [formerly def458753d]]
Former-commit-id: 8ce2584572b74cd38fac4b323558490c8c29e686 [formerly 19657ae52d]
Former-commit-id: 9b8c6e395d
 2012-04-19 11:11:02 -05:00
Steve Harris
5b35d8a6e0 12.4.1-4 baseline 
Former-commit-id: 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 4767b0e069 [formerly 750b7543dd] [formerly 67a5a68300] [formerly 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]]
Former-commit-id: 2a216f333c
Former-commit-id: 98d8b3f188 [formerly a2a6a18fae] [formerly e8514db31c64b82122112f0e87cbbf3cda2d8c2b [formerly a4e519f3cd]]
Former-commit-id: 816045b74a6ddb3791f4e241a6f25a4d4ab3391a [formerly 8cd5974f4c]
Former-commit-id: 74b66d9683
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
d25bbaaea2 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]]
Former-commit-id: 07cf5069ba
Former-commit-id: ea7fcde242 [formerly 4234b91d5b] [formerly bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]]
Former-commit-id: 28b91cc7176d4b78395f3f59578f0b975773db53 [formerly f20e674318]
Former-commit-id: e8bc0cfa66
 2012-03-30 10:51:31 -05:00
Steve Harris
095b190063 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: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: c6071e24c5 [formerly 9845ef53f9] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]]
Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4]
Former-commit-id: 1556e72eeb
 2012-03-30 09:50:48 -05:00
Steve Harris
9340618732 12.3.1-10 baseline 
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
 2012-03-30 08:38:33 -05:00
Steve Harris
8850e44772 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
 2012-03-29 10:03:05 -05:00
Max Schenkelberg
e6fcc458e5 Issue #358 Made wireframe shapes rely more on the grid geoemtry of the 
descriptor than the actual descriptor as the descriptor is used purely
for convenience 

Former-commit-id: 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]]
Former-commit-id: f10f1a5319
Former-commit-id: 5fc757226e [formerly bbab188fb9] [formerly 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18]]
Former-commit-id: cb1bc79da744506da785204d429e696d9676fb32 [formerly 2f3b9f0067]
Former-commit-id: e73e40dc78
 2012-03-28 13:32:04 -05:00
Max Schenkelberg
5706cf4610 Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in 
case of "NO DATA"

Former-commit-id: a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]]
Former-commit-id: b9085db25d
Former-commit-id: 13f08a98a9 [formerly 81bc45f071] [formerly 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c]]
Former-commit-id: d43b048af219f6ced6cf70ae84cf53f92bf3cae7 [formerly 645900727c]
Former-commit-id: 8878a9732d
 2012-03-16 10:13:31 -05:00
Max Schenkelberg
893bc3d143 Issue #358 Fixed sampling issue with mosaic resource with best 
res resources

Former-commit-id: 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 1b8beb3f8d [formerly 97edff9f7c] [formerly cc111ab9ac] [formerly 258d57e825 [formerly cc111ab9ac [formerly 8aaf5e65d7c8ecbced6252d4a98af6223c77d5a0]]]]
Former-commit-id: 258d57e825
Former-commit-id: 712815ee18 [formerly 4e81d2432c] [formerly 6ca4a7d453c44b2e3a855ba1e88fd28485927549 [formerly 1e5c074e3b]]
Former-commit-id: 98df734d7d4b6cec5aaffaedd02aad173354c879 [formerly a3bda1957c]
Former-commit-id: e220ddf515
 2012-03-16 09:03:50 -05:00
Max Schenkelberg
6b7a3c0976 Issue #358 Fixed painting and sampling regression in radar mosaic due to 
core improvements from NPP in GL mosaic imaging extension and discovered
while testing IMesh improvements

Former-commit-id: 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 732c2ddb5c [formerly 10b720381b] [formerly 719f87c261] [formerly 556a270a09 [formerly 719f87c261 [formerly f739d79bfd547adc295c716a1804f55f09b1bde1]]]]
Former-commit-id: 556a270a09
Former-commit-id: f51a9e5571 [formerly a4b859ae54] [formerly c943e46db5cb54b3fb026d1fe63057721df3c99d [formerly ba8af4dcc1]]
Former-commit-id: 0c6e6c289a70731ede2efaff64d0abccd158358b [formerly 682aca1dda]
Former-commit-id: d585d19f48
 2012-03-14 18:03:44 -05:00
Max Schenkelberg
42696fd296 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: 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 5a61f3ae23 [formerly 8fb7eccb73] [formerly 6e5964df9d] [formerly 50765e8a34 [formerly 6e5964df9d [formerly 7e4abe637edacca71e1e1c98d99521cd33415fb0]]]]
Former-commit-id: 50765e8a34
Former-commit-id: 458f5970aa [formerly 8f08fab0a7] [formerly 87c83af55da8aec24c975aa2f80b06b4449fa969 [formerly cf440b3884]]
Former-commit-id: 732d389245ce92a580088b9302b87702dca2b03d [formerly 6378e8c4ee]
Former-commit-id: 9366a5f308
 2012-03-14 09:49:32 -05:00
Max Schenkelberg
714bb7dfec Issue #358 Merging core drawing API improvements from Collaboration 
Former-commit-id: 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 3beecc1cdf [formerly 18805c68f7] [formerly d43b0456d8] [formerly 89f603f448 [formerly d43b0456d8 [formerly a266a93ec2dca3ffbd7d2fd1f9dc47d7e18e6904]]]]
Former-commit-id: 89f603f448
Former-commit-id: 8b6aa63464 [formerly f78b932abb] [formerly 69a2b029e678fdd8a18305144330e4c95774ec78 [formerly 4662ece060]]
Former-commit-id: 633ae123a39ad609c62c4173a428f3bfbc1fedbd [formerly 1303289d12]
Former-commit-id: 0f005d3521
 2012-03-09 12:31:50 -06:00
David Gillingham
65b8db12e8 Issue #354: Refactor AbstractParmManager to better handle ISC parm 
pre-loading.

Former-commit-id: 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 364b9e19b3 [formerly 1908212c27] [formerly d68e3a7eea] [formerly 494fbe93db [formerly d68e3a7eea [formerly e2c66b33fd8c71b0da6518c419296ab8141a07e3]]]]
Former-commit-id: 494fbe93db
Former-commit-id: e0987cc993 [formerly 29f03b0d2a] [formerly 22e522451d0eb5f0c7b3b2a357bfc73d015795c9 [formerly bc61eb1e43]]
Former-commit-id: c6da80d0d4984844822b65b3e0c4d22fd8ce459b [formerly ad8efe180e]
Former-commit-id: 678953ae76
 2012-03-05 11:23:11 -06:00
David Gillingham
4ed8de501b Issue #346: Convert GFE to use identity-based ListenerLists, increase 
synchronization in Parm/VCParm to prevent leaking of VCParms through
ListenerLists.

Former-commit-id: 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 87de9d067b [formerly bd01975367] [formerly f6f0ca24df] [formerly 0c0f659896 [formerly f6f0ca24df [formerly 5fc74409511903afa97949bc3cd1b3acf91c35e0]]]]
Former-commit-id: 0c0f659896
Former-commit-id: f670f3c950 [formerly bce9ad39ae] [formerly de321dd91cb8346ac092574ed9b7c81299c63edf [formerly b3df043f97]]
Former-commit-id: 26f66133ee05397f66e892ce87225a06441ee4f2 [formerly 788007ff63]
Former-commit-id: 0b79b9ea21
 2012-03-02 13:22:46 -06:00
Max Schenkelberg
67b1edb767 Issue #358 Committing NPP core rendering improvements merged with Thin 
Client core improvements

Former-commit-id: fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly fe1811c167 [formerly e2cd95d3f4] [formerly ae47d9683e] [formerly 48b6d45f00 [formerly ae47d9683e [formerly 206bd0450140b6bcdb3ec8f1e1e417c4c37746d6]]]]
Former-commit-id: 48b6d45f00
Former-commit-id: 52c7dec2e8 [formerly 0554abdde0] [formerly 22d12e35f7b0f5789a9dd62c8684fad371d63859 [formerly 3212cc6ebb]]
Former-commit-id: de90ce0a3f7817cfc15c75089e7f6a081fef0acc [formerly 585e979c76]
Former-commit-id: ae389f0b57
 2012-03-01 16:59:40 -06:00
Steve Harris
4ee0ec25ea Merge branch 'ss_sync' into sync_test 
Former-commit-id: 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 994e79cfb3 [formerly 3b9c3e3474] [formerly 951ecfe3dd] [formerly 787aed90f8 [formerly 951ecfe3dd [formerly 7ebcf63686d75d58f8bfea92e825edaf49a30df1]]]]
Former-commit-id: 787aed90f8
Former-commit-id: 6fdae68267 [formerly b3f831a7b4] [formerly 64c60f8d4b42c0f811914474c3baf46e1940786e [formerly db45babec8]]
Former-commit-id: 840d838fc0fb5c246c5a324aa5695ebb80f9cd44 [formerly 376edad3c9]
Former-commit-id: cdc4d1cb44
 2012-03-01 14:01:16 -06:00
Steve Harris
ddca739093 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 5bf956755a [formerly 8794c4bcf6] [formerly c21bd2719c] [formerly 9bdea0399f [formerly c21bd2719c [formerly c6eacfe2d5898deacf756f059a71b1c9f41500bb]]]]
Former-commit-id: 9bdea0399f
Former-commit-id: 13597e2d3d [formerly fe0b1eed94] [formerly 79ca895e04be795aebb8555aa0b0ba51850c543e [formerly 6f5c182af0]]
Former-commit-id: 06451943fd06a64b038ac1ecd053dc62e0c6d417 [formerly 6cdedca0a3]
Former-commit-id: 9ce7c680d7
 2012-03-01 13:19:04 -06:00
Ben Steffensmeier
94770ece64 Issue #353 apply the server time offset before requesting updates instead of after so that way there is no time gap for the first request 
Change-Id: I3ceb8cefbedc3b64ca207c559e8cd381f6f184fd

Former-commit-id: 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 5395e71757 [formerly aa90109f45] [formerly 49cce84edf] [formerly 7c2409eab0 [formerly 49cce84edf [formerly 059b4fcb3224b37b4a235f57e2065b9506f29d46]]]]
Former-commit-id: 7c2409eab0
Former-commit-id: 6ec01d1d19 [formerly f8c2ad7136] [formerly 691ebf923ce51c7c2978a0c30511852ac7042b3c [formerly 3220ee4745]]
Former-commit-id: b51eb6e37b89c7532969074ffcbece5003a934be [formerly e0ad3aee33]
Former-commit-id: 4e0ec11a6f
 2012-03-01 12:44:43 -06:00
Steve Harris
a92abefb52 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly 27fb50d455 [formerly 98d1fbeb0e] [formerly 703cb6e748] [formerly dd52eb4d40 [formerly 703cb6e748 [formerly 152f05b5ab3dc736f1d3d21dba09de79d98d4c9e]]]]
Former-commit-id: dd52eb4d40
Former-commit-id: f5db44b7aa [formerly 3e4d618486] [formerly fe7d53e8a206e849dc25fe40d0bef8cfe7ab3606 [formerly 06baad5169]]
Former-commit-id: eee203cb31afb34d2d81e92c3211de866f2b3b6f [formerly a4d8f58c90]
Former-commit-id: 3306848158
 2012-02-29 16:08:39 -06:00
Ben Steffensmeier
029c938b45 Issue #353 add logic to syncronize times for thin client data updates.. 
Change-Id: Id1f8e31bc95f0b0262821050be6660bfe66df9d1

Former-commit-id: 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly 07d98eb7dc [formerly 56d97c95d5] [formerly 5c303ed189] [formerly c61e40c426 [formerly 5c303ed189 [formerly f94248823eed52b2d9f8c56af3dc7607b323fc1e]]]]
Former-commit-id: c61e40c426
Former-commit-id: cc8e7897cf [formerly 390700efb0] [formerly bc3ac83b421a21ffdbc670c12096f7c96ca7c87f [formerly 84e6c9beb8]]
Former-commit-id: d164073f91d0b2a6b493c5bba3ad3cafd728023d [formerly 588432f980]
Former-commit-id: da7275d80b
 2012-02-29 15:49:47 -06:00
Ben Steffensmeier
70e6e0c580 Issue #352 initialize ThinClientDataUpdateTree as soon as component starts to ensure that it correctly sets the last query time. 
Change-Id: I13d4af0a1529e31f78e998db6bbdee228e749e1f

Former-commit-id: 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly 7c3545170d [formerly 3713d7a181] [formerly 5dee50e7e9] [formerly d7a63995f1 [formerly 5dee50e7e9 [formerly d05beaa84618bc01d8cb711298523dc358bb4938]]]]
Former-commit-id: d7a63995f1
Former-commit-id: 1ac84dc230 [formerly dba810ddc4] [formerly 17cbace4358ff60cc55095422d0870a3cb6e704b [formerly e52c2ffb20]]
Former-commit-id: b1cbf0e1d3e7d64bdf7e7eb29373c28474ccbf6b [formerly 7d4367ee7a]
Former-commit-id: f668495c76
 2012-02-28 15:20:37 -06:00
Steve Harris
e0dc50a21c Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly e08a6e4b1c [formerly c45e7b888c] [formerly aa597242f9] [formerly a4538f0a48 [formerly aa597242f9 [formerly 9864ba5dd0627dd8c68fae64aa7fad1916e40a0f]]]]
Former-commit-id: a4538f0a48
Former-commit-id: b65a901af6 [formerly 7c18ec7c7c] [formerly 0f7bb182634a23c54efdab2309f3cd0d4a2a8f14 [formerly fdd6018d1a]]
Former-commit-id: f8460df64844cd1534062e9459b9c707411b2b18 [formerly ba4a6aa434]
Former-commit-id: 98c100b36f
 2012-02-27 11:32:49 -06:00
Ben Steffensmeier
4496b2f98c Issue #345 fix swapping of nsharp since nsharp insists on using a disposed target 
Change-Id: I5a814be6590c2704dcd681bad7af34f0f9143ad2

Former-commit-id: 8fd9d92f0a [formerly 20481daa1b] [formerly 357dc4d88b] [formerly 8fd9d92f0a [formerly 20481daa1b] [formerly 357dc4d88b] [formerly 637c051a23 [formerly 357dc4d88b [formerly acec1c2a23f4e27bfd0844171fdca77ff5473050]]]]
Former-commit-id: 637c051a23
Former-commit-id: d5118790dd [formerly 88d2d2e4b6] [formerly bc7a93cc6ff900a77e00a7eb9d6864845eda90c8 [formerly 62f1ea0aac]]
Former-commit-id: 8c5c8bff0b6bd1f4321d4b9718028339dd9a0374 [formerly 0b4134f364]
Former-commit-id: cc91522fa0
 2012-02-24 14:57:23 -06:00
David Gillingham
adb2cd9b62 Issue #346: Create a dispose method for Parm and use it like AWIPS1's C++ destructor. 
Change-Id: I2e8a4e82d5efd210e546abbaf8c0aba960803a9d

Former-commit-id: 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 586f77e788 [formerly ef903bc728] [formerly d79f7e9613] [formerly 5aa5b51a55 [formerly d79f7e9613 [formerly b6d7661be725d8a37a8294b0eda982208c35ecbe]]]]
Former-commit-id: 5aa5b51a55
Former-commit-id: d10c91b814 [formerly 6bca8d6353] [formerly 9d586efeed036f273d51786977174c550e093ace [formerly f9ed20bada]]
Former-commit-id: 881794234bd8fda0f5c8288097c527c0e21e3ce0 [formerly 85c082f1e9]
Former-commit-id: 98bc9450d3
 2012-02-23 14:40:25 -06:00
David Gillingham
406ee3779d Issue #346: Fix disappearing ISC data from VCParms, fix threading issues in Scalar/Vector pickup value dialogs. 
Change-Id: If465b8daf5ef04a76084500425ac3114a48ab908

Former-commit-id: adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly adfd42b5ce [formerly 5a8ba0f0fb] [formerly 32b2c06988] [formerly 85998bc654 [formerly 32b2c06988 [formerly 67aaf1c21e8372b4a84cb82cae62549502992651]]]]
Former-commit-id: 85998bc654
Former-commit-id: d9def42052 [formerly 9ff631305a] [formerly fb4654a71df93b18d676c70825d89036de6bfcfe [formerly 88dcd4d09d]]
Former-commit-id: 3d9fbb450c702f842828ace3e919005130e3d6e0 [formerly 8e123e3ae0]
Former-commit-id: ca09c3a75a
 2012-02-23 13:23:59 -06:00
Steve Harris
587c928f4e Merge branch '4-Thin_Client' (with OB12.2.1) into 104-integration 
Conflicts:
	edexOsgi/build.edex/deploy-install.xml

Seems to have solved itself or was not actually a conflict


Former-commit-id: 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 0be3703c7e [formerly 4981170462] [formerly dcadf7baa4] [formerly 86e586befe [formerly dcadf7baa4 [formerly 9d9d92373b8e61c94c6d0f2b46baed3dc5cd7637]]]]
Former-commit-id: 86e586befe
Former-commit-id: fbb5de922a [formerly 4eb1ef5b0f] [formerly 5a0e0d2312e9dc1ae83176f1127db903c68bc140 [formerly 938dc5b21c]]
Former-commit-id: a02575690595cf7dbca41fcc8e53a47ab455d3ac [formerly 2c958713b6]
Former-commit-id: 93d99ca49c
 2012-02-23 12:38:55 -06:00
Steve Harris
5eee48b9d4 Merge (pull) branch '4-Thin_Client' of ssh://lightning.omaha.us.ray.com:29418/thunder into 4-Thin_Client 
Former-commit-id: ed66d12d24 [formerly c0c0acfbe8] [formerly 957d232286] [formerly ed66d12d24 [formerly c0c0acfbe8] [formerly 957d232286] [formerly a82f2c5750 [formerly 957d232286 [formerly de97ce5f9b687f7404a34cac0b1fc34df5f854cb]]]]
Former-commit-id: a82f2c5750
Former-commit-id: d1589bf5e5 [formerly 43b83ed8aa] [formerly 252271566acafedef77dcd075974af95164c1987 [formerly e6c3afa7a2]]
Former-commit-id: c518b10c39dfc70213090f622cc6866c1ea80878 [formerly 7f8343833e]
Former-commit-id: fd5ed23eb3
 2012-02-23 10:19:54 -06:00
Steve Harris
43ff909553 Merge branch 'ss_sync' (OB12.2.1) into 4-Thin_Client 
Conflicts:
	ncep/gov.noaa.nws.ncep.edex.plugin.ncgrib/src/gov/noaa/nws/ncep/edex/plugin/ncgrib/Ncgrib1Decoder.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/plotModels/PlotModelGenerator2.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/H5UairPlotInfoRetriever.java
	ncep/gov.noaa.nws.ncep.viz.rsc.plotdata/src/gov/noaa/nws/ncep/viz/rsc/plotdata/rsc/PlotResource2.java

deleted 'H5U; PlotResource2.java was not edited


Former-commit-id: 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 5a96582f16 [formerly 92084b3f20] [formerly d0bbbfefcc] [formerly 7a10ca9766 [formerly d0bbbfefcc [formerly 5528a1374781f3a4d55702ae1f0c34efcf1e3865]]]]
Former-commit-id: 7a10ca9766
Former-commit-id: 2d02f819be [formerly 92b7072b82] [formerly 6fb9d83319d58ea511061243437d2805a4c4ae7b [formerly 3d511fe719]]
Former-commit-id: 91921bfe8a96f90874dbc2e55763bb94f1fea024 [formerly ae9c52b012]
Former-commit-id: 3aef320ffd
 2012-02-23 10:06:18 -06:00
Ben Steffensmeier
1ab0935d7e Issue #345 allow double dispose of GLTarget 
Change-Id: Ib433557f82bc0bc63fb537814bad47eab00be2be

Former-commit-id: 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 13ecc7e4ea [formerly b776d953d7] [formerly 06c9d4cdcf] [formerly 55aa66a510 [formerly 06c9d4cdcf [formerly 8b906b245fd927ed79825b00dfba456a1c327fbb]]]]
Former-commit-id: 55aa66a510
Former-commit-id: e99e823ca8 [formerly c3d3142bab] [formerly caf20037931a8dff74e314931dddc204682bcdf7 [formerly 5d6b036ed7]]
Former-commit-id: 6fee95c5b888e0fa8f9b2d7a97de873918e1fe3b [formerly 8f34946969]
Former-commit-id: 16d205ce9d
 2012-02-22 17:40:48 -06:00
Steve Harris
3a4af24369 Merging SS OB12.2.1 into ss_sync 
Former-commit-id: 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 829d2791e9 [formerly 8da36046de] [formerly c8aae98741] [formerly 54be9660f1 [formerly c8aae98741 [formerly 60f30af0c9e3203e2ff623d420165201dff41601]]]]
Former-commit-id: 54be9660f1
Former-commit-id: 13a3edd4f6 [formerly b55a488ed8] [formerly 411ab8c69637be6b90bd3e06c4b1ab00caea0eec [formerly 4450cf8963]]
Former-commit-id: 3e362da5601c6ec9bcea9275fd2b0a509fb3e7fe [formerly 15c56d11bc]
Former-commit-id: 978d22db50
 2012-02-22 11:14:43 -06:00
Steve Harris
5876e9cbd8 Merge branch 14-NCEP into 'ss_sync' 
Former-commit-id: a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly a811ac888f [formerly 85075e6107] [formerly 94c2ea985b] [formerly 9995d22e25 [formerly 94c2ea985b [formerly a04c1c31c89566279953d2a270df8d652a3a82ff]]]]
Former-commit-id: 9995d22e25
Former-commit-id: 139d42c594 [formerly 610fdf3f4e] [formerly dccb91e6d6462a59f41fcbab353272041948d51b [formerly aaead73ec5]]
Former-commit-id: e696cc8d41ac682e234429cfacbb076d01f9bf39 [formerly 156ad8471d]
Former-commit-id: 01d72ca3c9
 2012-02-22 10:12:49 -06:00
Steve Harris
3f3299ecc9 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: aee8ef48fe [formerly 2c12c02910] [formerly 84926c80be] [formerly aee8ef48fe [formerly 2c12c02910] [formerly 84926c80be] [formerly f3fe839c1c [formerly 84926c80be [formerly fe86fe3696731660f6b37a147194c670906cdf4f]]]]
Former-commit-id: f3fe839c1c
Former-commit-id: 0295f24df1 [formerly 968239217e] [formerly f0db7f39e4b09a4a991fc462354c2e91299cc7e0 [formerly 6d1b04e62c]]
Former-commit-id: 55a40f23e7eef8b7b541db51cc5f43dbd2a6486a [formerly a14d90ed4d]
Former-commit-id: a9cfeacc6b
 2012-02-21 10:37:36 -06:00
Nate Jensen
5e8b286356 Merge "Issue #345 fix issues with gl contexts and creation and deletion of gl objects!" into 4-Thin_Client 
Former-commit-id: f17df86ba3 [formerly ba5b1ee03f] [formerly b90611d995] [formerly f17df86ba3 [formerly ba5b1ee03f] [formerly b90611d995] [formerly ec0cd8d086 [formerly b90611d995 [formerly ac8ad6fa074f715a4b53a66fc41267a70ccb90f8]]]]
Former-commit-id: ec0cd8d086
Former-commit-id: 8dc1ff026f [formerly 2ee4305d77] [formerly 7bcacb16073573ba01393828f50c6e24f05ad1a2 [formerly 13ea11ddfc]]
Former-commit-id: d35beb3e9eb86a05ce74f17d71f4a87fbd877d46 [formerly f92be47f79]
Former-commit-id: 0d56994428
 2012-02-21 08:57:12 -06:00
Ben Steffensmeier
3db83d5483 Issue #345 fix issues with gl contexts and creation and deletion of gl objects! 
Change-Id: Ied6c7a814478e21f3cd0eccabfecb00a92e698db

Former-commit-id: 1c1500408b [formerly 27973ec694] [formerly 69e8cde115] [formerly 1c1500408b [formerly 27973ec694] [formerly 69e8cde115] [formerly 73d24fad2f [formerly 69e8cde115 [formerly e0f697c492eecff4bb8d83d05efbcaf2876125c9]]]]
Former-commit-id: 73d24fad2f
Former-commit-id: ab464fde3e [formerly 0ee68fb6cc] [formerly 2e661e9d7cba71c6da9333bda034d1523204696a [formerly dcbe4fc7da]]
Former-commit-id: 7ea333df81161d3c9921a921c48714ab475fa9aa [formerly f949f622dd]
Former-commit-id: f934ade63a
 2012-02-20 15:28:20 -06:00
Steve Harris
f0c1c03fff 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: eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly eda787edea [formerly d971880b98] [formerly cabf9fd956] [formerly 5e9d2dd367 [formerly cabf9fd956 [formerly f7ae49d33e6b672f35b55287c9b8ab780bd0f2ce]]]]
Former-commit-id: 5e9d2dd367
Former-commit-id: 2e0f1d3ecc [formerly b12f5e5d75] [formerly a529cc7da8a5f072c8a414b5af753a556a2be162 [formerly 33483f3960]]
Former-commit-id: f7595a0be89f8ab41c20c0d16d038e5e650e4712 [formerly acd7845ebd]
Former-commit-id: bcccffbaa4
 2012-02-20 13:03:39 -06:00
Steve Harris
2acea8b7d5 Merge branch 'ss_sync' (OB12.1.2-4) into 10-Tech_Blocked 
Former-commit-id: cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly cc45f5a268 [formerly a2fd2cf6fa] [formerly 6a064cb78b] [formerly d02529fef4 [formerly 6a064cb78b [formerly ad74b15c5cab1f5275521f18ee67d30f199a8f95]]]]
Former-commit-id: d02529fef4
Former-commit-id: 4ffbe4780e [formerly b41e5f2415] [formerly b1cec7b0617c7b5f5c46fade03d4b59fd4aeb442 [formerly d133454b27]]
Former-commit-id: 1d157738e844ae1be12f9b1669c8101f16df9737 [formerly d9c8a99210]
Former-commit-id: d3c80a1557
 2012-02-20 12:54:25 -06:00
Steve Harris
33aafe9ce0 Merge branch 'ss_sync' (OB12.1.2-4) into 4-Thin_Client 
Former-commit-id: d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly d129eab241 [formerly c268da57bc] [formerly 4b76d22f77] [formerly cc66c8be24 [formerly 4b76d22f77 [formerly a998a29e2f756ffc583eac04a884dcf9aae585e8]]]]
Former-commit-id: cc66c8be24
Former-commit-id: c9a7ff42f4 [formerly dd911bed4d] [formerly 892342d6ba506e3495ef7df3355174001fd47f5a [formerly 54b5b6baef]]
Former-commit-id: 589ae505ef0a6ce52a577fd189d1c8eec012a6bd [formerly 09b81c6e00]
Former-commit-id: 60bf5aeced
 2012-02-20 12:43:38 -06:00
Steve Harris
b19d2a7103 Merge branch '4-Thin_Client' into 104-integration 
Former-commit-id: f3cee62470 [formerly e3535054ff] [formerly 62c587b841] [formerly f3cee62470 [formerly e3535054ff] [formerly 62c587b841] [formerly c825bd03a2 [formerly 62c587b841 [formerly aaf3d445f517bba03e9f6b768850f2a8c77d26ed]]]]
Former-commit-id: c825bd03a2
Former-commit-id: 07f2cb3a81 [formerly b609a6fd60] [formerly 84a9ca92db5e27c27139e506edd8d80314f58cf7 [formerly 0fab56e0f1]]
Former-commit-id: 791c66fd6faa00ee56fdc3d955b64d47cef51e34 [formerly f265cb965d]
Former-commit-id: 41571066d5
 2012-02-20 07:49:13 -06:00
Steve Harris
8c9e581f41 Manual merge of SS OB12.1.2-4 changes into ss_sync 
Former-commit-id: 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly 7b4b066a2b [formerly c209d6de36] [formerly 93f6535bd8] [formerly b137302802 [formerly 93f6535bd8 [formerly 0ccca40d35e50072218a1da1db474075f8ad0393]]]]
Former-commit-id: b137302802
Former-commit-id: 43c3cfdd1a [formerly 1ac6b36d1f] [formerly eeaad2f7633b220d953999828d906362e3a79992 [formerly 65b22abd24]]
Former-commit-id: f9b44e61385fcc409fa97cc2681f13c4a9c57a4a [formerly 895404abeb]
Former-commit-id: 9a09879521
 2012-02-17 10:55:02 -06:00
Ben Steffensmeier
455537fa9f Issue #343 unpack thinclient cave plugin so that removed pluigns file can be easily mofified. 
Change-Id: I50c56ca84cdd2f911dc03eb06bf68dfdc785dcf0

Former-commit-id: be6c430985 [formerly 38993f5a5a] [formerly 26d82729c9] [formerly be6c430985 [formerly 38993f5a5a] [formerly 26d82729c9] [formerly 3e3e4bd4e3 [formerly 26d82729c9 [formerly 04a68e6815001450fece9bb5fbf6ce99143e2d05]]]]
Former-commit-id: 3e3e4bd4e3
Former-commit-id: 44cf04ab3c [formerly ea93dcd939] [formerly 352ec371eefbdee61fc6971ec28eadecfb26a5b4 [formerly d4e7df98a9]]
Former-commit-id: 5159ce4d957b2c026dd58d2bc6e3b0b3711f002c [formerly c286cb0406]
Former-commit-id: b648274e36
 2012-02-16 16:36:56 -06:00