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

226 commits

This branch
This branch
All branches
Author SHA1 Message Date
Steve Harris
8278cac143 12.12.1-1 baseline 
Former-commit-id: e1498006c7 [formerly e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]
Former-commit-id: e4bd20a515
Former-commit-id: c2839cc86d
 2012-11-07 12:41:20 -06:00
Steve Harris
7f6baf2e24 12.11.1-12 baseline 
Former-commit-id: 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]
Former-commit-id: 8682e4f6ca
Former-commit-id: 565756567f
 2012-10-29 12:15:56 -05:00
Steve Harris
7779b584c0 12.11.1-10 baseline 
Former-commit-id: 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]
Former-commit-id: e845c605e6
Former-commit-id: 63dddc5f5f
 2012-10-24 15:13:57 -05:00
Steve Harris
59e5b55b96 12.11.1-7 baseline 
Former-commit-id: 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]
Former-commit-id: d8ca6b9005
Former-commit-id: 40a5bc1683
 2012-10-23 16:40:50 -05:00
Steve Harris
58cd1e90f8 12.11.1-6 baseline 
Former-commit-id: 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]
Former-commit-id: fba4a443a0
Former-commit-id: 30c786a885
 2012-10-18 15:53:01 -05:00
Steve Harris
bb8fe6e556 12.11.1-5 baseline 
Former-commit-id: a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]
Former-commit-id: 03f3f3c36a
Former-commit-id: 362d6ffaca
 2012-10-18 15:46:42 -05:00
Steve Harris
6e44abdba1 12.11.1-4 baseline 
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
 2012-10-16 13:27:07 -05:00
Steve Harris
a65c057df5 12.11.1-3 baseline 
Former-commit-id: 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]
Former-commit-id: 2d0c424713
Former-commit-id: 196afa0e5f
 2012-10-15 16:30:31 -05:00
Steve Harris
04da0dbf50 12.11.1-2 baseline 
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b

Former-commit-id: 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]
Former-commit-id: c12ee14e66
Former-commit-id: 75901860c2
 2012-10-08 13:26:20 -05:00
Steven Harris
ffe3641057 12.11.1-1 baseline 
Former-commit-id: feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]
Former-commit-id: 618aa3f316
Former-commit-id: 0e86bfd1d3
 2012-09-27 15:57:45 -05:00
Steve Harris
e6f952f0ea 12.10.1-8 baseline 
Former-commit-id: 73d29311d0 [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]
Former-commit-id: dbd73151ca
Former-commit-id: b062e4de8f
 2012-09-25 10:26:58 -05:00
Steve Harris
9677f9321f 12.10.1-7 baseline 
Former-commit-id: 7b37cfca85 [formerly b754630136 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]
Former-commit-id: b754630136
Former-commit-id: 2ee78eaf6d
 2012-09-25 10:21:10 -05:00
Steve Harris
dd922048c0 12.10.1-6 baseline 
Former-commit-id: ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]
Former-commit-id: cebe6534ae
Former-commit-id: 81d91a8289
 2012-09-25 10:14:23 -05:00
Steve Harris
d0cd58d6bc 12.10.1-5 baseline 
Former-commit-id: 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]
Former-commit-id: a96d35a1fa
Former-commit-id: 82feb4de50
 2012-09-17 15:42:31 -05:00
Steve Harris
fdf35b8b3f Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds 
Former-commit-id: b06a9469b1 [formerly 13adee3fe9 [formerly f17d5e913412e959e1f950bbd8e07516508f651f]]
Former-commit-id: 13adee3fe9
Former-commit-id: 790af9ec63
 2012-09-17 08:18:31 -05:00
Bryan Kowal
1d2942e048 Fix the git ignore file 
Former-commit-id: 4d7cb017ce [formerly 2e1fe9663c [formerly 667a1c4eb019c27679ad8391608d852745ffa898]]
Former-commit-id: 2e1fe9663c
Former-commit-id: 40e2924ce0
 2012-09-14 12:04:24 -05:00
Steve Harris
ddc923e3e0 12.10.1-4 baseline 
Former-commit-id: 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]
Former-commit-id: 791ef6cedf
Former-commit-id: 9cd1f3ec0f
 2012-09-13 12:33:36 -05:00
Steve Harris
0d8d18d7e2 12.10.1-4 baseline 
Former-commit-id: 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]
Former-commit-id: fd19ca5624
Former-commit-id: e38e81ab8c
 2012-09-13 12:08:11 -05:00
Steve Harris
bbc20f4a68 12.10.1-3 baseline (better than previous which was missing changeset 7d75620) 
Former-commit-id: fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]
Former-commit-id: 077ced354e
Former-commit-id: 22dac5c82e
 2012-09-12 13:10:36 -05:00
Steve Harris
0403e7d0a9 12.10.1-3 baseline 
Former-commit-id: 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]
Former-commit-id: 21f430062b
Former-commit-id: de1639aea2
 2012-09-11 16:00:38 -05:00
Steve Harris
bb190a66a1 12.10.1-2 baseline 
Former-commit-id: a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]
Former-commit-id: 250f0ccac9
Former-commit-id: dde1f4c54d
 2012-09-11 15:50:57 -05:00
Steve Harris
7248f8b762 12.10.1-1 baseline 
Former-commit-id: d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]
Former-commit-id: 195158c004
Former-commit-id: 0abf64b77c
 2012-09-04 12:07:27 -05:00
Steve Harris
6784576fc9 12.9.1-12 baseline 
Former-commit-id: 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]
Former-commit-id: 948766c387
Former-commit-id: 4bf4f0043a
 2012-09-04 11:47:38 -05:00
Steve Harris
a2bb1dabe0 12.9.1-11 baseline 
Former-commit-id: fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]
Former-commit-id: 6eb6b0909b
Former-commit-id: d07c18918d
 2012-08-30 14:36:12 -05:00
Steve Harris
264d870cbf 12.9.1-10 baseline 
Former-commit-id: cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]
Former-commit-id: 3adc50a783
Former-commit-id: bdb45cdfae
 2012-08-30 14:28:27 -05:00
Steve Harris
e1cf4b0b9a 12.9.1-5 baseline (with forgotten bin files now included) 
Former-commit-id: b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]
Former-commit-id: b8ab6066f6
Former-commit-id: 7a4f4ac493
 2012-08-22 16:00:33 -05:00
Steve Harris
77cbd6c1e5 12.9.1-5 baseline 
Former-commit-id: f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]
Former-commit-id: 61f269f54c
Former-commit-id: a1d931fd44
 2012-08-21 15:27:03 -05:00
Steve Harris
71b024e3a1 12.9.1-4 baseline 
Former-commit-id: 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]
Former-commit-id: dcda3a2290
Former-commit-id: 36c108e960
 2012-08-15 15:19:10 -05:00
Steve Harris
8083b81729 12.9.1-3 baseline 
Former-commit-id: 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]
Former-commit-id: 36d80b1f60
Former-commit-id: c11f7d396e
 2012-08-15 14:26:10 -05:00
Steve Harris
ecba93c959 12.9.1-2 baseline 
Former-commit-id: a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]
Former-commit-id: d1d877d319
Former-commit-id: 27871051e3
 2012-08-15 14:12:24 -05:00
Steve Harris
b9fb1c89d4 12.9.1-1 baseline 
Former-commit-id: 79ce6cfd97 [formerly 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]
Former-commit-id: 31ae7ea218
Former-commit-id: 8309193ce9
 2012-08-15 13:59:00 -05:00
Steve Harris
79d4d91e46 12.8.1-10 baseline 
Former-commit-id: ca25d508ec [formerly b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]
Former-commit-id: b5e8fee24d
Former-commit-id: 6244359a80
 2012-08-06 09:34:26 -05:00
Steve Harris
2e804fc8c4 12.8.1-5 baseline 
Former-commit-id: cd49ef3eda [formerly fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]
Former-commit-id: fd2abfb6f1
Former-commit-id: 2653ddc2e3
 2012-08-01 10:45:37 -05:00
Steve Harris
b242dd98d6 12.7.1-8 baseline 
Former-commit-id: c42ae0fa39 [formerly 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]
Former-commit-id: 16bf591a33
Former-commit-id: 11f96dbedd
 2012-07-19 16:20:40 -05:00
Steve Harris
32fdf6ed3b 12.6.1-9 baseline 
Former-commit-id: 27afa60345 [formerly 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]
Former-commit-id: 2c0ff851ca
Former-commit-id: 7c064b6868
 2012-07-10 07:53:49 -05:00
Steve Harris
de3f944384 Issue #708 - removed extraneous files 
Former-commit-id: fbe7e50417 [formerly 1a67fdba3f [formerly 389c544088260bd6d6d107f51dc36426e9af3229]]
Former-commit-id: 1a67fdba3f
Former-commit-id: d2e6687295
 2012-06-20 08:15:55 -05:00
Steve Harris
a18fd2f871 Merge branch 'master' into ss_sync 
Former-commit-id: 645359deaf [formerly d507f3b71d [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]
Former-commit-id: d507f3b71d
Former-commit-id: 5a5db8dc6a
 2012-06-13 14:56:52 -05:00
Steve Harris
2f10c7a1e4 12.5.1-15 baseline 
Former-commit-id: 3904c4ccf5 [formerly b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]
Former-commit-id: b13cbb7e00
Former-commit-id: 8552902906
 2012-06-08 13:39:48 -05:00
Max Schenkelberg
e0a22310dc Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: e3d6962fe6 [formerly 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]
Former-commit-id: 3fe183277b
Former-commit-id: 2ef208b263
 2012-05-01 18:36:09 -05:00
Steve Harris
fe946166ed 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: 7b75b781ad [formerly 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]
Former-commit-id: 2ed7249613
Former-commit-id: 4ec294b525
 2012-05-01 18:31:09 -05:00
Steve Harris
7fa9dbd5fb 12.4.1-10 baseline 
Former-commit-id: 8485b90ff8 [formerly 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]
Former-commit-id: 9f8cb727a5
Former-commit-id: 4bfbdad17d
 2012-05-01 18:06:13 -05:00
Max Schenkelberg
9126809973 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 90a5c20b5a [formerly 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]]
Former-commit-id: 1294fa0ca1
Former-commit-id: e03ee60c75
 2012-04-19 11:11:34 -05:00
Steve Harris
634d40a156 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: 625cd4262c [formerly 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]
Former-commit-id: 4d7572a632
Former-commit-id: 63f11892e8
 2012-04-19 11:11:02 -05:00
Steve Harris
4767b0e069 12.4.1-4 baseline 
Former-commit-id: 2a216f333c [formerly 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]
Former-commit-id: 67a5a68300
Former-commit-id: 750b7543dd
 2012-04-18 15:18:16 -05:00
Max Schenkelberg
25cf44a674 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]
Former-commit-id: 9b0d01f8b5
Former-commit-id: 74458bfb73
 2012-03-30 10:51:31 -05:00
Steve Harris
b4846ce8a8 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: 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]
Former-commit-id: d3ad6095b7
Former-commit-id: a4e4792bb5
 2012-03-30 09:50:48 -05:00
Steve Harris
760ead2047 12.3.1-10 baseline 
Former-commit-id: 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]
Former-commit-id: 4068f5295f
Former-commit-id: 0e4128712b
 2012-03-30 08:38:33 -05:00
Steve Harris
b05701d2d7 Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]
Former-commit-id: 70357d90bc
Former-commit-id: 0665862abe
 2012-03-29 10:03:05 -05:00
Steve Harris
770ccb1520 Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync 
Former-commit-id: 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]
Former-commit-id: 132d68acc6
Former-commit-id: 94e6323c0a
 2012-03-29 10:01:55 -05:00
Max Schenkelberg
86d3763df0 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: f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]
Former-commit-id: 15a9245592
Former-commit-id: 66eaffb9ee
 2012-03-28 13:32:04 -05:00