Steve Harris
|
7bb37caa23
|
12.12.1-12 baseline
Former-commit-id: e8e41630e8 [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]
Former-commit-id: 6d610f8e8a
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
0c67cb78a3
|
12.12.1-10 baseline
Former-commit-id: 45f5150eb6 [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]
Former-commit-id: 28018b8d9b
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
ee06a94735
|
12.12.1-8 baseline
Former-commit-id: 19962f41ba [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]
Former-commit-id: 5093a7c442
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
628ca9e5c6
|
12.12.1-4 baseline
Former-commit-id: 85130eb611 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]
Former-commit-id: 57578da521
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
2797cbcdd0
|
12.12.1-3 baseline
Former-commit-id: c999505fba [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]
Former-commit-id: b3b5e6d28f
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
df89fe9bed
|
12.12.1-2 baseline
Former-commit-id: a8560580f8 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]
Former-commit-id: 6868eb9b23
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
214fcd3b63
|
12.12.1-1 baseline
Former-commit-id: e4bd20a515 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]
Former-commit-id: e1498006c7
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
314c03e7b6
|
12.11.1-12 baseline
Former-commit-id: 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]
Former-commit-id: 9ff9cb8aa3
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
cc21977c35
|
12.11.1-10 baseline
Former-commit-id: e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]
Former-commit-id: 0ba69044a2
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
cfd228f0d7
|
12.11.1-7 baseline
Former-commit-id: d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]
Former-commit-id: 79a5638de9
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
08fc9f6b14
|
12.11.1-6 baseline
Former-commit-id: fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]
Former-commit-id: 5c1f3cdc46
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
e31c1e5bba
|
12.11.1-5 baseline
Former-commit-id: 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]
Former-commit-id: a0eaf651ff
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
cbbdb231ce
|
12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
5723fb0031
|
12.11.1-3 baseline
Former-commit-id: 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]
Former-commit-id: 5d796f775c
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
42bf60b2fc
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]
Former-commit-id: 1e02387ff1
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
8843ffd022
|
12.11.1-1 baseline
Former-commit-id: 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]
Former-commit-id: feec28f274
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
94137c6ba1
|
12.10.1-8 baseline
Former-commit-id: dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]
Former-commit-id: 73d29311d0
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
30592ab872
|
12.10.1-7 baseline
Former-commit-id: b754630136 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]
Former-commit-id: 7b37cfca85
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
5d5a61bd75
|
12.10.1-6 baseline
Former-commit-id: cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]
Former-commit-id: ba648f8e72
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
deed84c1a2
|
12.10.1-5 baseline
Former-commit-id: a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]
Former-commit-id: 4fd8893e55
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
1c21fe109f
|
Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
Former-commit-id: 13adee3fe9 [formerly f17d5e913412e959e1f950bbd8e07516508f651f]
Former-commit-id: b06a9469b1
|
2012-09-17 08:18:31 -05:00 |
|
Bryan Kowal
|
079e3f926e
|
Fix the git ignore file
Former-commit-id: 2e1fe9663c [formerly 667a1c4eb019c27679ad8391608d852745ffa898]
Former-commit-id: 4d7cb017ce
|
2012-09-14 12:04:24 -05:00 |
|
Steve Harris
|
b4d2a0e8dd
|
12.10.1-4 baseline
Former-commit-id: 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]
Former-commit-id: 92cc2d8605
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
2ba58a3576
|
12.10.1-4 baseline
Former-commit-id: fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]
Former-commit-id: 49c3861597
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
ba25027ea5
|
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]
Former-commit-id: fd5e214e72
|
2012-09-12 13:10:36 -05:00 |
|
Steve Harris
|
438d139fdd
|
12.10.1-3 baseline
Former-commit-id: 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]
Former-commit-id: 969e7e6dfd
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
34d2ddee9d
|
12.10.1-2 baseline
Former-commit-id: 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]
Former-commit-id: a66f3f4b60
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
7bd9c63dc7
|
12.10.1-1 baseline
Former-commit-id: 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]
Former-commit-id: d708932029
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
9311c1737e
|
12.9.1-12 baseline
Former-commit-id: 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]
Former-commit-id: 150bc967a5
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
a14374fcd4
|
12.9.1-11 baseline
Former-commit-id: 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]
Former-commit-id: fc405efab7
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
dc08c5a71a
|
12.9.1-10 baseline
Former-commit-id: 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]
Former-commit-id: cb9b80f3a0
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
b2c0dd1abb
|
12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]
Former-commit-id: b77a4d40d7
|
2012-08-22 16:00:33 -05:00 |
|
Steve Harris
|
72824561cb
|
12.9.1-5 baseline
Former-commit-id: 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]
Former-commit-id: f2fac39428
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
9990bf909b
|
12.9.1-4 baseline
Former-commit-id: dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]
Former-commit-id: 33b95fb96d
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
edbbacfa8a
|
12.9.1-3 baseline
Former-commit-id: 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]
Former-commit-id: 84bbf2573e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
448ed038c2
|
12.9.1-2 baseline
Former-commit-id: d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]
Former-commit-id: a198b3a807
|
2012-08-15 14:12:24 -05:00 |
|
Steve Harris
|
0c5d9e2416
|
12.9.1-1 baseline
Former-commit-id: 31ae7ea218 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]
Former-commit-id: 79ce6cfd97
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
d5563fc340
|
12.8.1-10 baseline
Former-commit-id: b5e8fee24d [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]
Former-commit-id: ca25d508ec
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
e0c3722fd1
|
12.8.1-5 baseline
Former-commit-id: fd2abfb6f1 [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]
Former-commit-id: cd49ef3eda
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
9f97182964
|
12.7.1-8 baseline
Former-commit-id: 16bf591a33 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]
Former-commit-id: c42ae0fa39
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
4f7bb90bb0
|
12.6.1-9 baseline
Former-commit-id: 2c0ff851ca [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]
Former-commit-id: 27afa60345
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
eca93e924c
|
Issue #708 - removed extraneous files
Former-commit-id: 1a67fdba3f [formerly 389c544088260bd6d6d107f51dc36426e9af3229]
Former-commit-id: fbe7e50417
|
2012-06-20 08:15:55 -05:00 |
|
Steve Harris
|
c778c97bd6
|
Merge branch 'master' into ss_sync
Former-commit-id: d507f3b71d [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]
Former-commit-id: 645359deaf
|
2012-06-13 14:56:52 -05:00 |
|
Steve Harris
|
676ea3192f
|
12.5.1-15 baseline
Former-commit-id: b13cbb7e00 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]
Former-commit-id: 3904c4ccf5
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
878de45ee6
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 3fe183277b [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]
Former-commit-id: e3d6962fe6
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
6dd3ee8809
|
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: 2ed7249613 [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]
Former-commit-id: 7b75b781ad
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
a28d70b5c5
|
12.4.1-10 baseline
Former-commit-id: 9f8cb727a5 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]
Former-commit-id: 8485b90ff8
|
2012-05-01 18:06:13 -05:00 |
|
Max Schenkelberg
|
65c864aff2
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 1294fa0ca1 [formerly bd93246cccd1b123598006d7343eac265392695d]
Former-commit-id: 90a5c20b5a
|
2012-04-19 11:11:34 -05:00 |
|
Steve Harris
|
def458753d
|
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: 4d7572a632 [formerly 5e1b9319941eed516a08a135a2049c14bad77863]
Former-commit-id: 625cd4262c
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
a4e519f3cd
|
12.4.1-4 baseline
Former-commit-id: 67a5a68300 [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]
Former-commit-id: 2a216f333c
|
2012-04-18 15:18:16 -05:00 |
|