Steve Harris
|
b9cd443717
|
13.1.2-9 baseline
Former-commit-id: 6fd587d08d [formerly 0878a7ea57] [formerly 6fd587d08d [formerly 0878a7ea57] [formerly ddc6aec013 [formerly da5b6c5b6999445b5ded541aac1bbdb46f0d322d]]]
Former-commit-id: ddc6aec013
Former-commit-id: 5b752c12c4 [formerly 5e0a9a8fd2]
Former-commit-id: 3f93a9eb2e
|
2013-01-18 10:29:52 -05:00 |
|
Steve Harris
|
92f1e9416c
|
13.1.2-8 baseline
Former-commit-id: b864fdc303 [formerly e6217a17de] [formerly b864fdc303 [formerly e6217a17de] [formerly 06b8eb8db0 [formerly c8797ef99646b2e093ad60cb9a6ee9643405a13f]]]
Former-commit-id: 06b8eb8db0
Former-commit-id: 7d0109a349 [formerly 3caf592e83]
Former-commit-id: 066c14dcd2
|
2013-01-11 16:19:07 -05:00 |
|
Steve Harris
|
1ef10eaf2c
|
13.1.2-7 baseline
Former-commit-id: a8d90da9c0 [formerly 4f86b07eb0] [formerly a8d90da9c0 [formerly 4f86b07eb0] [formerly 42189b5f88 [formerly 0c4514d3be8e7dee89a2abe903b51155a2895fd4]]]
Former-commit-id: 42189b5f88
Former-commit-id: f1256f2a9e [formerly b7f1dbe72b]
Former-commit-id: 775a338b90
|
2013-01-11 16:12:09 -05:00 |
|
Steve Harris
|
b7f180d9d3
|
13.1.2-6 baseline
Former-commit-id: efd3392abe [formerly 8e5f9e0e6c] [formerly efd3392abe [formerly 8e5f9e0e6c] [formerly 59969775ad [formerly 184f16c9f91fb06efa7aeaf5499ace33f4f17bf7]]]
Former-commit-id: 59969775ad
Former-commit-id: 82a1ed77a4 [formerly dbcae57f57]
Former-commit-id: 05bdc0ecd2
|
2013-01-06 14:55:11 -06:00 |
|
Steve Harris
|
f52ec0b0a0
|
13.1.2-2 baseline
Former-commit-id: 51208e5515 [formerly c0c1d56f3a] [formerly 51208e5515 [formerly c0c1d56f3a] [formerly 4ba416aeb3 [formerly 221d0aaf0e19a054387134e72a76a278159bf4d0]]]
Former-commit-id: 4ba416aeb3
Former-commit-id: cd4185ef5c [formerly 941337c553]
Former-commit-id: b6fa9b4858
|
2013-01-06 14:32:24 -06:00 |
|
Steve Harris
|
f8a9ae24cb
|
12.12.1-12 baseline
Former-commit-id: 89def5cf03 [formerly e8e41630e8] [formerly 89def5cf03 [formerly e8e41630e8] [formerly 6d610f8e8a [formerly ae5110532f5ac5c7842a5483a8e2c3dc299ae814]]]
Former-commit-id: 6d610f8e8a
Former-commit-id: 69ab975fab [formerly 7bb37caa23]
Former-commit-id: 190378beeb
|
2012-12-06 09:18:28 -06:00 |
|
Steve Harris
|
a10d7d3041
|
12.12.1-10 baseline
Former-commit-id: c7ec50d4f9 [formerly 45f5150eb6] [formerly c7ec50d4f9 [formerly 45f5150eb6] [formerly 28018b8d9b [formerly 07d77ee5ca986f9762ec9c3276e8320e3f363ebc]]]
Former-commit-id: 28018b8d9b
Former-commit-id: 8a41d325d2 [formerly 0c67cb78a3]
Former-commit-id: 8ada406bfe
|
2012-12-06 09:12:15 -06:00 |
|
Steve Harris
|
0b22b3c014
|
12.12.1-8 baseline
Former-commit-id: 2d338b4cec [formerly 19962f41ba] [formerly 2d338b4cec [formerly 19962f41ba] [formerly 5093a7c442 [formerly 657c868c5e52717a6de00dc61892115d91ada1c4]]]
Former-commit-id: 5093a7c442
Former-commit-id: ff4131c2ee [formerly ee06a94735]
Former-commit-id: ec2cdc1593
|
2012-12-06 09:02:51 -06:00 |
|
Steve Harris
|
2c2bfc949d
|
12.12.1-4 baseline
Former-commit-id: b91b7f0fae [formerly 85130eb611] [formerly b91b7f0fae [formerly 85130eb611] [formerly 57578da521 [formerly 4a7e3fabdef8d948216483965c1f62e5216bf362]]]
Former-commit-id: 57578da521
Former-commit-id: e35a321a8c [formerly 628ca9e5c6]
Former-commit-id: 493f335c0b
|
2012-11-14 14:19:20 -06:00 |
|
Steve Harris
|
7058ebec23
|
12.12.1-3 baseline
Former-commit-id: a81c46987b [formerly c999505fba] [formerly a81c46987b [formerly c999505fba] [formerly b3b5e6d28f [formerly 8481c91f9918a61631198331c324c4c5a76aac0f]]]
Former-commit-id: b3b5e6d28f
Former-commit-id: 2e3662028f [formerly 2797cbcdd0]
Former-commit-id: 314495dc8e
|
2012-11-13 17:27:04 -06:00 |
|
Steve Harris
|
53d74c66e7
|
12.12.1-2 baseline
Former-commit-id: ed809a02db [formerly a8560580f8] [formerly ed809a02db [formerly a8560580f8] [formerly 6868eb9b23 [formerly 90019fdb91dad949f125e46de9300ccd44f6e315]]]
Former-commit-id: 6868eb9b23
Former-commit-id: 111e7607cf [formerly df89fe9bed]
Former-commit-id: 96a4a4f3f5
|
2012-11-13 17:14:24 -06:00 |
|
Steve Harris
|
af59663a99
|
12.12.1-1 baseline
Former-commit-id: c2839cc86d [formerly e4bd20a515] [formerly c2839cc86d [formerly e4bd20a515] [formerly e1498006c7 [formerly 7699acd8cfc5cfa4e902ba98d5fdc2f7c474a535]]]
Former-commit-id: e1498006c7
Former-commit-id: 4f243de928 [formerly 214fcd3b63]
Former-commit-id: a5be98d6de
|
2012-11-07 12:41:20 -06:00 |
|
Steve Harris
|
a9e1b01ad7
|
12.11.1-12 baseline
Former-commit-id: 565756567f [formerly 8682e4f6ca] [formerly 565756567f [formerly 8682e4f6ca] [formerly 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: d8b6157aab [formerly 314c03e7b6]
Former-commit-id: 09f6e43195
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
03c572edba
|
12.11.1-10 baseline
Former-commit-id: 63dddc5f5f [formerly e845c605e6] [formerly 63dddc5f5f [formerly e845c605e6] [formerly 0ba69044a2 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]
Former-commit-id: 0ba69044a2
Former-commit-id: 61224dec54 [formerly cc21977c35]
Former-commit-id: 19c4526e61
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
26badd258f
|
12.11.1-7 baseline
Former-commit-id: 40a5bc1683 [formerly d8ca6b9005] [formerly 40a5bc1683 [formerly d8ca6b9005] [formerly 79a5638de9 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]
Former-commit-id: 79a5638de9
Former-commit-id: efba080b9c [formerly cfd228f0d7]
Former-commit-id: 572085c119
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
9c597c7060
|
12.11.1-6 baseline
Former-commit-id: 30c786a885 [formerly fba4a443a0] [formerly 30c786a885 [formerly fba4a443a0] [formerly 5c1f3cdc46 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: 8beb6fc0b8 [formerly 08fc9f6b14]
Former-commit-id: 4f27cbb406
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
13cdd55545
|
12.11.1-5 baseline
Former-commit-id: 362d6ffaca [formerly 03f3f3c36a] [formerly 362d6ffaca [formerly 03f3f3c36a] [formerly a0eaf651ff [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]
Former-commit-id: a0eaf651ff
Former-commit-id: 85ad066b70 [formerly e31c1e5bba]
Former-commit-id: dff8d5de9c
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
35e34308c5
|
12.11.1-4 baseline
Former-commit-id: 98171b5de9 [formerly d3497e47eb] [formerly 98171b5de9 [formerly d3497e47eb] [formerly 6958b861f0 [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: 2c82d9cb07 [formerly cbbdb231ce]
Former-commit-id: 560f0d9cc3
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
c25ebcdc41
|
12.11.1-3 baseline
Former-commit-id: 196afa0e5f [formerly 2d0c424713] [formerly 196afa0e5f [formerly 2d0c424713] [formerly 5d796f775c [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]
Former-commit-id: 5d796f775c
Former-commit-id: 725b2f8ba5 [formerly 5723fb0031]
Former-commit-id: bf1f88482b
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
ff9321e3ce
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 75901860c2 [formerly c12ee14e66] [formerly 75901860c2 [formerly c12ee14e66] [formerly 1e02387ff1 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 772c60efa4 [formerly 42bf60b2fc]
Former-commit-id: e72b6d5da6
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
2f855322f6
|
12.11.1-1 baseline
Former-commit-id: 0e86bfd1d3 [formerly 618aa3f316] [formerly 0e86bfd1d3 [formerly 618aa3f316] [formerly feec28f274 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]
Former-commit-id: feec28f274
Former-commit-id: f5e63d5f93 [formerly 8843ffd022]
Former-commit-id: a544be6d83
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
659a009c00
|
12.10.1-8 baseline
Former-commit-id: b062e4de8f [formerly dbd73151ca] [formerly b062e4de8f [formerly dbd73151ca] [formerly 73d29311d0 [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]
Former-commit-id: 73d29311d0
Former-commit-id: f4e218c4dd [formerly 94137c6ba1]
Former-commit-id: 57d4eacbb5
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
6419b3c85c
|
12.10.1-7 baseline
Former-commit-id: 2ee78eaf6d [formerly b754630136] [formerly 2ee78eaf6d [formerly b754630136] [formerly 7b37cfca85 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]]
Former-commit-id: 7b37cfca85
Former-commit-id: b18e5b5f2e [formerly 30592ab872]
Former-commit-id: 2a6e4b513c
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
20732fcbd5
|
12.10.1-6 baseline
Former-commit-id: 81d91a8289 [formerly cebe6534ae] [formerly 81d91a8289 [formerly cebe6534ae] [formerly ba648f8e72 [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]
Former-commit-id: ba648f8e72
Former-commit-id: 0e77eb2fe2 [formerly 5d5a61bd75]
Former-commit-id: e39023bb85
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
288d4afff5
|
12.10.1-5 baseline
Former-commit-id: 82feb4de50 [formerly a96d35a1fa] [formerly 82feb4de50 [formerly a96d35a1fa] [formerly 4fd8893e55 [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]
Former-commit-id: 4fd8893e55
Former-commit-id: a903893a09 [formerly deed84c1a2]
Former-commit-id: 430a11f72b
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
e57e7237a9
|
12.10.1-4 baseline
Former-commit-id: e38e81ab8c [formerly fd19ca5624] [formerly e38e81ab8c [formerly fd19ca5624] [formerly 49c3861597 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]
Former-commit-id: 49c3861597
Former-commit-id: 684feb34e5 [formerly 2ba58a3576]
Former-commit-id: 26b7d083ec
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
6ce314ca65
|
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: 22dac5c82e [formerly 077ced354e] [formerly 22dac5c82e [formerly 077ced354e] [formerly fd5e214e72 [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]
Former-commit-id: fd5e214e72
Former-commit-id: 9f3bd0d4ec [formerly ba25027ea5]
Former-commit-id: 2002a7cb8d
|
2012-09-12 13:10:36 -05:00 |
|
Steve Harris
|
5030894212
|
12.10.1-3 baseline
Former-commit-id: de1639aea2 [formerly 21f430062b] [formerly de1639aea2 [formerly 21f430062b] [formerly 969e7e6dfd [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: f376a4b4db [formerly 438d139fdd]
Former-commit-id: faadb51529
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
5684a84a46
|
12.10.1-2 baseline
Former-commit-id: dde1f4c54d [formerly 250f0ccac9] [formerly dde1f4c54d [formerly 250f0ccac9] [formerly a66f3f4b60 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]
Former-commit-id: a66f3f4b60
Former-commit-id: ec74f638e5 [formerly 34d2ddee9d]
Former-commit-id: cc3c3dadee
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
a924a8347a
|
12.10.1-1 baseline
Former-commit-id: 0abf64b77c [formerly 195158c004] [formerly 0abf64b77c [formerly 195158c004] [formerly d708932029 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]
Former-commit-id: d708932029
Former-commit-id: e720b8ed31 [formerly 7bd9c63dc7]
Former-commit-id: d65f35ffe9
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
c1e601dc30
|
12.9.1-12 baseline
Former-commit-id: 4bf4f0043a [formerly 948766c387] [formerly 4bf4f0043a [formerly 948766c387] [formerly 150bc967a5 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]
Former-commit-id: 150bc967a5
Former-commit-id: 782941ccc1 [formerly 9311c1737e]
Former-commit-id: 38aa573545
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
982804ee0e
|
12.9.1-11 baseline
Former-commit-id: d07c18918d [formerly 6eb6b0909b] [formerly d07c18918d [formerly 6eb6b0909b] [formerly fc405efab7 [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]
Former-commit-id: fc405efab7
Former-commit-id: dc5ec3d16d [formerly a14374fcd4]
Former-commit-id: f401755cde
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
ede38c4b3f
|
12.9.1-10 baseline
Former-commit-id: bdb45cdfae [formerly 3adc50a783] [formerly bdb45cdfae [formerly 3adc50a783] [formerly cb9b80f3a0 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: f43a5af47f [formerly dc08c5a71a]
Former-commit-id: 5bb474d33c
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
2d928d328e
|
12.9.1-5 baseline
Former-commit-id: a1d931fd44 [formerly 61f269f54c] [formerly a1d931fd44 [formerly 61f269f54c] [formerly f2fac39428 [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]
Former-commit-id: f2fac39428
Former-commit-id: 7fb0b17bd5 [formerly 72824561cb]
Former-commit-id: 9b5c2094ed
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
7e1d1f6e08
|
12.9.1-4 baseline
Former-commit-id: 36c108e960 [formerly dcda3a2290] [formerly 36c108e960 [formerly dcda3a2290] [formerly 33b95fb96d [formerly df38541c9df38c634626ae214f288b606004a768]]]
Former-commit-id: 33b95fb96d
Former-commit-id: d7d60cc623 [formerly 9990bf909b]
Former-commit-id: de9b64b501
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
03bb51ed0e
|
12.9.1-3 baseline
Former-commit-id: c11f7d396e [formerly 36d80b1f60] [formerly c11f7d396e [formerly 36d80b1f60] [formerly 84bbf2573e [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]
Former-commit-id: 84bbf2573e
Former-commit-id: a535b51eba [formerly edbbacfa8a]
Former-commit-id: 8c5c5ad6eb
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
adf346e7d3
|
12.9.1-2 baseline
Former-commit-id: 27871051e3 [formerly d1d877d319] [formerly 27871051e3 [formerly d1d877d319] [formerly a198b3a807 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]
Former-commit-id: a198b3a807
Former-commit-id: de4c812834 [formerly 448ed038c2]
Former-commit-id: ed416f241e
|
2012-08-15 14:12:24 -05:00 |
|
Steve Harris
|
16d7d955fc
|
12.9.1-1 baseline
Former-commit-id: 8309193ce9 [formerly 31ae7ea218] [formerly 8309193ce9 [formerly 31ae7ea218] [formerly 79ce6cfd97 [formerly 6601ddb09c2928754c2c3859dac284998d73ff81]]]
Former-commit-id: 79ce6cfd97
Former-commit-id: aed7a644df [formerly 0c5d9e2416]
Former-commit-id: 63bcadf121
|
2012-08-15 13:59:00 -05:00 |
|
Steve Harris
|
78d66ba6df
|
12.8.1-10 baseline
Former-commit-id: 6244359a80 [formerly b5e8fee24d] [formerly 6244359a80 [formerly b5e8fee24d] [formerly ca25d508ec [formerly 7c799ab7b99993c77b6568529b46aaf13d01300b]]]
Former-commit-id: ca25d508ec
Former-commit-id: 78d34d65d2 [formerly d5563fc340]
Former-commit-id: 46daa48f1c
|
2012-08-06 09:34:26 -05:00 |
|
Steve Harris
|
d3be09bd74
|
12.8.1-5 baseline
Former-commit-id: 2653ddc2e3 [formerly fd2abfb6f1] [formerly 2653ddc2e3 [formerly fd2abfb6f1] [formerly cd49ef3eda [formerly 99fb675cc2e1b94825ccda1fe09b1be0c3c25b3f]]]
Former-commit-id: cd49ef3eda
Former-commit-id: dab00b12e6 [formerly e0c3722fd1]
Former-commit-id: e86949a8d3
|
2012-08-01 10:45:37 -05:00 |
|
Steve Harris
|
36e2ad3023
|
12.7.1-8 baseline
Former-commit-id: 11f96dbedd [formerly 16bf591a33] [formerly 11f96dbedd [formerly 16bf591a33] [formerly c42ae0fa39 [formerly 46767a18a0d6e1f2182720c8a04c6e1e59cb18a1]]]
Former-commit-id: c42ae0fa39
Former-commit-id: f2102bfb24 [formerly 9f97182964]
Former-commit-id: 9aabe438b9
|
2012-07-19 16:20:40 -05:00 |
|
Steve Harris
|
37f2b6e138
|
12.6.1-9 baseline
Former-commit-id: 7c064b6868 [formerly 2c0ff851ca] [formerly 7c064b6868 [formerly 2c0ff851ca] [formerly 27afa60345 [formerly 8f93efb93ec2d244fe599c16b3af5b33784c0232]]]
Former-commit-id: 27afa60345
Former-commit-id: dc50bc8443 [formerly 4f7bb90bb0]
Former-commit-id: d5fa61041b
|
2012-07-10 07:53:49 -05:00 |
|
Steve Harris
|
39ff9954f8
|
12.5.1-15 baseline
Former-commit-id: 8552902906 [formerly b13cbb7e00] [formerly 8552902906 [formerly b13cbb7e00] [formerly 3904c4ccf5 [formerly 4909e0dd166e43c22a34d96aa744f51db8a7d6c0]]]
Former-commit-id: 3904c4ccf5
Former-commit-id: 97c4db937e [formerly 676ea3192f]
Former-commit-id: 9054c5ab6c
|
2012-06-08 13:39:48 -05:00 |
|
Max Schenkelberg
|
4ddcccc3c7
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 2ef208b263 [formerly 3fe183277b] [formerly 2ef208b263 [formerly 3fe183277b] [formerly e3d6962fe6 [formerly e8846fa2b5aa1ef2972f134a683246bc275a8067]]]
Former-commit-id: e3d6962fe6
Former-commit-id: 338f80fa87 [formerly 878de45ee6]
Former-commit-id: 9f72069996
|
2012-05-01 18:36:09 -05:00 |
|
Steve Harris
|
491aa53a0c
|
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: 4ec294b525 [formerly 2ed7249613] [formerly 4ec294b525 [formerly 2ed7249613] [formerly 7b75b781ad [formerly 05d9729acfe9e0f4af4a6ec030052ab26b0a5eb9]]]
Former-commit-id: 7b75b781ad
Former-commit-id: 7c7fc97131 [formerly 6dd3ee8809]
Former-commit-id: fd9e226b35
|
2012-05-01 18:31:09 -05:00 |
|
Steve Harris
|
0c25458510
|
12.4.1-10 baseline
Former-commit-id: 4bfbdad17d [formerly 9f8cb727a5] [formerly 4bfbdad17d [formerly 9f8cb727a5] [formerly 8485b90ff8 [formerly bf53d06834caa780226121334ac1bcf0534c3f16]]]
Former-commit-id: 8485b90ff8
Former-commit-id: 33a67cdd82 [formerly a28d70b5c5]
Former-commit-id: e5543a0e86
|
2012-05-01 18:06:13 -05:00 |
|
Max Schenkelberg
|
33d08f1496
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: e03ee60c75 [formerly 1294fa0ca1] [formerly e03ee60c75 [formerly 1294fa0ca1] [formerly 90a5c20b5a [formerly bd93246cccd1b123598006d7343eac265392695d]]]
Former-commit-id: 90a5c20b5a
Former-commit-id: 51a826384e [formerly 65c864aff2]
Former-commit-id: 72a27b7ae0
|
2012-04-19 11:11:34 -05:00 |
|
Steve Harris
|
9b8c6e395d
|
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: 63f11892e8 [formerly 4d7572a632] [formerly 63f11892e8 [formerly 4d7572a632] [formerly 625cd4262c [formerly 5e1b9319941eed516a08a135a2049c14bad77863]]]
Former-commit-id: 625cd4262c
Former-commit-id: e86dc647be [formerly def458753d]
Former-commit-id: 19657ae52d
|
2012-04-19 11:11:02 -05:00 |
|
Steve Harris
|
74b66d9683
|
12.4.1-4 baseline
Former-commit-id: 750b7543dd [formerly 67a5a68300] [formerly 750b7543dd [formerly 67a5a68300] [formerly 2a216f333c [formerly ad648deaf4d3edaabdda15184289b3a927308bd7]]]
Former-commit-id: 2a216f333c
Former-commit-id: a2a6a18fae [formerly a4e519f3cd]
Former-commit-id: 8cd5974f4c
|
2012-04-18 15:18:16 -05:00 |
|
Max Schenkelberg
|
e8bc0cfa66
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 74458bfb73 [formerly 9b0d01f8b5] [formerly 74458bfb73 [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: 4234b91d5b [formerly 993cac891e]
Former-commit-id: f20e674318
|
2012-03-30 10:51:31 -05:00 |
|