Steve Harris
|
6d610f8e8a
|
12.12.1-12 baseline
Former-commit-id: ae5110532f5ac5c7842a5483a8e2c3dc299ae814
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
28018b8d9b
|
12.12.1-10 baseline
Former-commit-id: 07d77ee5ca986f9762ec9c3276e8320e3f363ebc
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
5093a7c442
|
12.12.1-8 baseline
Former-commit-id: 657c868c5e52717a6de00dc61892115d91ada1c4
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
57578da521
|
12.12.1-4 baseline
Former-commit-id: 4a7e3fabdef8d948216483965c1f62e5216bf362
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
b3b5e6d28f
|
12.12.1-3 baseline
Former-commit-id: 8481c91f9918a61631198331c324c4c5a76aac0f
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
6868eb9b23
|
12.12.1-2 baseline
Former-commit-id: 90019fdb91dad949f125e46de9300ccd44f6e315
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
e1498006c7
|
12.12.1-1 baseline
Former-commit-id: 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
9ff9cb8aa3
|
12.11.1-12 baseline
Former-commit-id: 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
0ba69044a2
|
12.11.1-10 baseline
Former-commit-id: 9dd41e6322bad3e7dced1a32867d9a7f886d70cf
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
79a5638de9
|
12.11.1-7 baseline
Former-commit-id: 59b9a93267bcf7b82fdefc55784289f7510117d0
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
5c1f3cdc46
|
12.11.1-6 baseline
Former-commit-id: 18939af3b7cf54a36970d65d528003f4fe489eb7
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
a0eaf651ff
|
12.11.1-5 baseline
Former-commit-id: a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
6958b861f0
|
12.11.1-4 baseline
Former-commit-id: dddf20c9518c578d1bebd0b5e01b10c5080fd24e
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
5d796f775c
|
12.11.1-3 baseline
Former-commit-id: 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
1e02387ff1
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: da126f587a1e3761dbe16ee2a41aee0caba85bfc
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
feec28f274
|
12.11.1-1 baseline
Former-commit-id: 765055b5332ddace3cec2d07e279652de869cfe4
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
73d29311d0
|
12.10.1-8 baseline
Former-commit-id: 8a4573f57ba9a05d26f91070346050f66d94a58d
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
7b37cfca85
|
12.10.1-7 baseline
Former-commit-id: 161fb1c0295ff4aa3b78d06ae248255d77a4e886
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
ba648f8e72
|
12.10.1-6 baseline
Former-commit-id: b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
4fd8893e55
|
12.10.1-5 baseline
Former-commit-id: 28dc700c3ef97a134c8871c2c52086fe7db43035
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
b06a9469b1
|
Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
Former-commit-id: f17d5e913412e959e1f950bbd8e07516508f651f
|
2012-09-17 08:18:31 -05:00 |
|
Bryan Kowal
|
4d7cb017ce
|
Fix the git ignore file
Former-commit-id: 667a1c4eb019c27679ad8391608d852745ffa898
|
2012-09-14 12:04:24 -05:00 |
|
Steve Harris
|
92cc2d8605
|
12.10.1-4 baseline
Former-commit-id: ce574eeff1d197862c8aac2d3fc838a452862576
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
49c3861597
|
12.10.1-4 baseline
Former-commit-id: 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
fd5e214e72
|
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: af8ffe73c81cd980843f137800f9fbb453c9e2c0
|
2012-09-12 13:10:36 -05:00 |
|
Steve Harris
|
969e7e6dfd
|
12.10.1-3 baseline
Former-commit-id: 1a94c1ca3674c8e4dbb8847de5190efe33da371c
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
a66f3f4b60
|
12.10.1-2 baseline
Former-commit-id: 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
d708932029
|
12.10.1-1 baseline
Former-commit-id: 7d17407c5b0a4a3f9b4b083891a5a5975c645810
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
150bc967a5
|
12.9.1-12 baseline
Former-commit-id: 09035ea929c2e926b2dce13429c29d3fd3707880
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
fc405efab7
|
12.9.1-11 baseline
Former-commit-id: 046d9078b7aa87ff8df98142556713fe38d95c63
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
cb9b80f3a0
|
12.9.1-10 baseline
Former-commit-id: 32048810bc091d7ba09a321c36cd5a78b2d4bd39
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
b77a4d40d7
|
12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e977bd92cef6986b14725164c9eaa417ecf359cf
|
2012-08-22 16:00:33 -05:00 |
|
Steve Harris
|
f2fac39428
|
12.9.1-5 baseline
Former-commit-id: d85b989f77196d20eb2d2a21cf4daa13d50474ae
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
33b95fb96d
|
12.9.1-4 baseline
Former-commit-id: df38541c9df38c634626ae214f288b606004a768
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
84bbf2573e
|
12.9.1-3 baseline
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
a198b3a807
|
12.9.1-2 baseline
Former-commit-id: 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2
|
2012-08-15 14:12:24 -05:00 |
|
Steve Harris
|
79ce6cfd97
|
12.9.1-1 baseline
Former-commit-id: 6601ddb09c2928754c2c3859dac284998d73ff81
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
ca25d508ec
|
12.8.1-10 baseline
Former-commit-id: 7c799ab7b99993c77b6568529b46aaf13d01300b
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
cd49ef3eda
|
12.8.1-5 baseline
Former-commit-id: 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
c42ae0fa39
|
12.7.1-8 baseline
Former-commit-id: 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
27afa60345
|
12.6.1-9 baseline
Former-commit-id: 8f93efb93ec2d244fe599c16b3af5b33784c0232
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
fbe7e50417
|
Issue #708 - removed extraneous files
Former-commit-id: 389c544088260bd6d6d107f51dc36426e9af3229
|
2012-06-20 08:15:55 -05:00 |
|
Steve Harris
|
645359deaf
|
Merge branch 'master' into ss_sync
Former-commit-id: 3b20277effa5ff76e68610d2d85afc950aae3387
|
2012-06-13 14:56:52 -05:00 |
|
Steve Harris
|
3904c4ccf5
|
12.5.1-15 baseline
Former-commit-id: 4909e0dd166e43c22a34d96aa744f51db8a7d6c0
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
e3d6962fe6
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e8846fa2b5aa1ef2972f134a683246bc275a8067
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
7b75b781ad
|
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: 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
8485b90ff8
|
12.4.1-10 baseline
Former-commit-id: bf53d06834caa780226121334ac1bcf0534c3f16
|
2012-05-01 18:06:13 -05:00 |
|
Max Schenkelberg
|
90a5c20b5a
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: bd93246cccd1b123598006d7343eac265392695d
|
2012-04-19 11:11:34 -05:00 |
|
Steve Harris
|
625cd4262c
|
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: 5e1b9319941eed516a08a135a2049c14bad77863
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
2a216f333c
|
12.4.1-4 baseline
Former-commit-id: ad648deaf4d3edaabdda15184289b3a927308bd7
|
2012-04-18 15:18:16 -05:00 |
|