Steve Harris
|
6c48aaeda6
|
12.11.1-12 baseline
Former-commit-id: 7f6baf2e24 [formerly 565756567f ] [formerly 8682e4f6ca ] [formerly 7f6baf2e24 [formerly 565756567f ] [formerly 8682e4f6ca ] [formerly 9ff9cb8aa3 [formerly 8682e4f6ca [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]]]]
Former-commit-id: 9ff9cb8aa3
Former-commit-id: 89940e8fed [formerly d8b6157aab ] [formerly 1acfe145013f9afdd8c598af509871593462a766 [formerly 314c03e7b6 ]]
Former-commit-id: 46aec701f4c85f6b083e2354a854e34621b6523a [formerly 09f6e43195 ]
Former-commit-id: a9e1b01ad7
|
2012-10-29 12:15:56 -05:00 |
|
Steve Harris
|
31f4d435fa
|
12.11.1-10 baseline
Former-commit-id: 7779b584c0 [formerly 63dddc5f5f ] [formerly e845c605e6 ] [formerly 7779b584c0 [formerly 63dddc5f5f ] [formerly e845c605e6 ] [formerly 0ba69044a2 [formerly e845c605e6 [formerly 9dd41e6322bad3e7dced1a32867d9a7f886d70cf]]]]
Former-commit-id: 0ba69044a2
Former-commit-id: e7a5f938d5 [formerly 61224dec54 ] [formerly 6fcb4f94c3d3270f1daa5300ab582f30625bdf7c [formerly cc21977c35 ]]
Former-commit-id: 828641fdb972b87922811423dc1701994a2d5fea [formerly 19c4526e61 ]
Former-commit-id: 03c572edba
|
2012-10-24 15:13:57 -05:00 |
|
Steve Harris
|
056baad808
|
12.11.1-7 baseline
Former-commit-id: 59e5b55b96 [formerly 40a5bc1683 ] [formerly d8ca6b9005 ] [formerly 59e5b55b96 [formerly 40a5bc1683 ] [formerly d8ca6b9005 ] [formerly 79a5638de9 [formerly d8ca6b9005 [formerly 59b9a93267bcf7b82fdefc55784289f7510117d0]]]]
Former-commit-id: 79a5638de9
Former-commit-id: 320a29466d [formerly efba080b9c ] [formerly 901f56658eaeddda857d877834f967b14c2f861c [formerly cfd228f0d7 ]]
Former-commit-id: c0d6c794fa054693cb0037318fdbd31ace4531a3 [formerly 572085c119 ]
Former-commit-id: 26badd258f
|
2012-10-23 16:40:50 -05:00 |
|
Steve Harris
|
2d368b5b0b
|
12.11.1-6 baseline
Former-commit-id: 58cd1e90f8 [formerly 30c786a885 ] [formerly fba4a443a0 ] [formerly 58cd1e90f8 [formerly 30c786a885 ] [formerly fba4a443a0 ] [formerly 5c1f3cdc46 [formerly fba4a443a0 [formerly 18939af3b7cf54a36970d65d528003f4fe489eb7]]]]
Former-commit-id: 5c1f3cdc46
Former-commit-id: ae73939b02 [formerly 8beb6fc0b8 ] [formerly 4bf85ed3f3986d98a009ad57add9c40fe46fa2f2 [formerly 08fc9f6b14 ]]
Former-commit-id: bfbc6b62be31cb07dee1061fd2ffeb9b2a9e932a [formerly 4f27cbb406 ]
Former-commit-id: 9c597c7060
|
2012-10-18 15:53:01 -05:00 |
|
Steve Harris
|
92be4d5105
|
12.11.1-5 baseline
Former-commit-id: bb8fe6e556 [formerly 362d6ffaca ] [formerly 03f3f3c36a ] [formerly bb8fe6e556 [formerly 362d6ffaca ] [formerly 03f3f3c36a ] [formerly a0eaf651ff [formerly 03f3f3c36a [formerly a2b34f5c48d7a8e6e73a35d18dd565222bc7caa7]]]]
Former-commit-id: a0eaf651ff
Former-commit-id: dfdf01de85 [formerly 85ad066b70 ] [formerly 3d301c8774eee84c53a845367dfdb251b5c0f118 [formerly e31c1e5bba ]]
Former-commit-id: 90ed5b647bfe3dc11c44294f7a83b7e770575415 [formerly dff8d5de9c ]
Former-commit-id: 13cdd55545
|
2012-10-18 15:46:42 -05:00 |
|
Steve Harris
|
8794e3b599
|
12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6e44abdba1 [formerly 98171b5de9 ] [formerly d3497e47eb ] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07 ] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce ]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3 ]
Former-commit-id: 35e34308c5
|
2012-10-16 13:27:07 -05:00 |
|
Steve Harris
|
e42c12350b
|
12.11.1-3 baseline
Former-commit-id: a65c057df5 [formerly 196afa0e5f ] [formerly 2d0c424713 ] [formerly a65c057df5 [formerly 196afa0e5f ] [formerly 2d0c424713 ] [formerly 5d796f775c [formerly 2d0c424713 [formerly 33ddeff32d02d6302c7e9e61a3b5d8cbf0440b86]]]]
Former-commit-id: 5d796f775c
Former-commit-id: 7fcbb49a3e [formerly 725b2f8ba5 ] [formerly 0e268084394b033a5de6dba694d14423a1da3040 [formerly 5723fb0031 ]]
Former-commit-id: eaae8c3b883f287ffd1c17522c62444fa45a6410 [formerly bf1f88482b ]
Former-commit-id: c25ebcdc41
|
2012-10-15 16:30:31 -05:00 |
|
Steve Harris
|
75d99f4e93
|
12.11.1-2 baseline
Change-Id: I1c6018b226a4dba788f50edff8801aa33939a83b
Former-commit-id: 04da0dbf50 [formerly 75901860c2 ] [formerly c12ee14e66 ] [formerly 04da0dbf50 [formerly 75901860c2 ] [formerly c12ee14e66 ] [formerly 1e02387ff1 [formerly c12ee14e66 [formerly da126f587a1e3761dbe16ee2a41aee0caba85bfc]]]]
Former-commit-id: 1e02387ff1
Former-commit-id: 6e0b2c55d7 [formerly 772c60efa4 ] [formerly 4b6477f6b0ceaafd125d3a6350ab34e5d7c81ad7 [formerly 42bf60b2fc ]]
Former-commit-id: 8fe8231e2d1c3ba8a832320dad34957e6a59e8fe [formerly e72b6d5da6 ]
Former-commit-id: ff9321e3ce
|
2012-10-08 13:26:20 -05:00 |
|
Steven Harris
|
db663faca9
|
12.11.1-1 baseline
Former-commit-id: ffe3641057 [formerly 0e86bfd1d3 ] [formerly 618aa3f316 ] [formerly ffe3641057 [formerly 0e86bfd1d3 ] [formerly 618aa3f316 ] [formerly feec28f274 [formerly 618aa3f316 [formerly 765055b5332ddace3cec2d07e279652de869cfe4]]]]
Former-commit-id: feec28f274
Former-commit-id: 9c67bbab77 [formerly f5e63d5f93 ] [formerly 5951ea0cd95d43633ba501132c7b65a55db27e09 [formerly 8843ffd022 ]]
Former-commit-id: d6911f5473d9aadbb4a4b9d3389106feb8c83693 [formerly a544be6d83 ]
Former-commit-id: 2f855322f6
|
2012-09-27 15:57:45 -05:00 |
|
Steve Harris
|
6fc7ef7034
|
12.10.1-8 baseline
Former-commit-id: e6f952f0ea [formerly b062e4de8f ] [formerly dbd73151ca ] [formerly e6f952f0ea [formerly b062e4de8f ] [formerly dbd73151ca ] [formerly 73d29311d0 [formerly dbd73151ca [formerly 8a4573f57ba9a05d26f91070346050f66d94a58d]]]]
Former-commit-id: 73d29311d0
Former-commit-id: 326954a0b8 [formerly f4e218c4dd ] [formerly 28e9acf68c2e0b1a4c89ad83acb71825adbd9965 [formerly 94137c6ba1 ]]
Former-commit-id: ea5cc2020fb2f65e6c2d7d6317de0dadba16d2db [formerly 57d4eacbb5 ]
Former-commit-id: 659a009c00
|
2012-09-25 10:26:58 -05:00 |
|
Steve Harris
|
32608f3225
|
12.10.1-7 baseline
Former-commit-id: 9677f9321f [formerly 2ee78eaf6d ] [formerly b754630136 ] [formerly 9677f9321f [formerly 2ee78eaf6d ] [formerly b754630136 ] [formerly 7b37cfca85 [formerly b754630136 [formerly 161fb1c0295ff4aa3b78d06ae248255d77a4e886]]]]
Former-commit-id: 7b37cfca85
Former-commit-id: 3df1d781a7 [formerly b18e5b5f2e ] [formerly 3c2e7eeb8b3932870c7deeb8b9c0408a284968c4 [formerly 30592ab872 ]]
Former-commit-id: 5a0ba5b4c37f5fddce4a8d1a566ae6a457f326b2 [formerly 2a6e4b513c ]
Former-commit-id: 6419b3c85c
|
2012-09-25 10:21:10 -05:00 |
|
Steve Harris
|
60ef7d29e0
|
12.10.1-6 baseline
Former-commit-id: dd922048c0 [formerly 81d91a8289 ] [formerly cebe6534ae ] [formerly dd922048c0 [formerly 81d91a8289 ] [formerly cebe6534ae ] [formerly ba648f8e72 [formerly cebe6534ae [formerly b0c7a01c0318ed09bb5eb7ff6cc6550948f19cbc]]]]
Former-commit-id: ba648f8e72
Former-commit-id: d5ec4edea1 [formerly 0e77eb2fe2 ] [formerly e2eff41ad429447d5c80be0157ac1ea818d306fa [formerly 5d5a61bd75 ]]
Former-commit-id: ca8586dbe32865ad7ca07ad5a47da5d57ccd01ad [formerly e39023bb85 ]
Former-commit-id: 20732fcbd5
|
2012-09-25 10:14:23 -05:00 |
|
Steve Harris
|
277255717d
|
12.10.1-5 baseline
Former-commit-id: d0cd58d6bc [formerly 82feb4de50 ] [formerly a96d35a1fa ] [formerly d0cd58d6bc [formerly 82feb4de50 ] [formerly a96d35a1fa ] [formerly 4fd8893e55 [formerly a96d35a1fa [formerly 28dc700c3ef97a134c8871c2c52086fe7db43035]]]]
Former-commit-id: 4fd8893e55
Former-commit-id: 70566fbec1 [formerly a903893a09 ] [formerly 3760dcf872cc3205410a8002df70f1952ec6e644 [formerly deed84c1a2 ]]
Former-commit-id: 04dc60f4a3b146bf387bf04f40efb975397eb03d [formerly 430a11f72b ]
Former-commit-id: 288d4afff5
|
2012-09-17 15:42:31 -05:00 |
|
Steve Harris
|
2700d99961
|
Merge branch 'ss_builds' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into ss_builds
Former-commit-id: fdf35b8b3f [formerly 790af9ec63 ] [formerly 13adee3fe9 ] [formerly fdf35b8b3f [formerly 790af9ec63 ] [formerly 13adee3fe9 ] [formerly b06a9469b1 [formerly 13adee3fe9 [formerly f17d5e913412e959e1f950bbd8e07516508f651f]]]]
Former-commit-id: b06a9469b1
Former-commit-id: a0ca603f51 [formerly fa7d2ba33b ] [formerly d07ab3eaa2b0787e5bc7de978148e9392dc93f3f [formerly 1c21fe109f ]]
Former-commit-id: cc1b83a58a2d3f1a5f478163176b5adc2bd65d4c [formerly 0cde1ea473 ]
Former-commit-id: 009465d3ea
|
2012-09-17 08:18:31 -05:00 |
|
Bryan Kowal
|
615fdf420b
|
Fix the git ignore file
Former-commit-id: 1d2942e048 [formerly 40e2924ce0 ] [formerly 2e1fe9663c ] [formerly 1d2942e048 [formerly 40e2924ce0 ] [formerly 2e1fe9663c ] [formerly 4d7cb017ce [formerly 2e1fe9663c [formerly 667a1c4eb019c27679ad8391608d852745ffa898]]]]
Former-commit-id: 4d7cb017ce
Former-commit-id: 0a3517c40c [formerly dba734953b ] [formerly 25bb4f691f05b4d1d2312cde924c62cd7819f9f8 [formerly 079e3f926e ]]
Former-commit-id: cdc64252e199cecbaa965a8fc7fe73029710657d [formerly dfb42b74bd ]
Former-commit-id: bb314e096a
|
2012-09-14 12:04:24 -05:00 |
|
Steve Harris
|
987397b2db
|
12.10.1-4 baseline
Former-commit-id: ddc923e3e0 [formerly 9cd1f3ec0f ] [formerly 791ef6cedf ] [formerly ddc923e3e0 [formerly 9cd1f3ec0f ] [formerly 791ef6cedf ] [formerly 92cc2d8605 [formerly 791ef6cedf [formerly ce574eeff1d197862c8aac2d3fc838a452862576]]]]
Former-commit-id: 92cc2d8605
Former-commit-id: 27d8601fe0 [formerly f641cdd4e0 ] [formerly 53da655c90a1b4d0e3b7bbcaf373c23ba32edc6a [formerly b4d2a0e8dd ]]
Former-commit-id: 5159825bf9b81d8d0188fb4bcfd469ccb27fd393 [formerly 451459d8cb ]
Former-commit-id: f61c5114e8
|
2012-09-13 12:33:36 -05:00 |
|
Steve Harris
|
ed04125cd7
|
12.10.1-4 baseline
Former-commit-id: 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 0d8d18d7e2 [formerly e38e81ab8c ] [formerly fd19ca5624 ] [formerly 49c3861597 [formerly fd19ca5624 [formerly 56e6f8927c92cd546e5fb7a01ad2f19add91f6ed]]]]
Former-commit-id: 49c3861597
Former-commit-id: 424c32bd5d [formerly 684feb34e5 ] [formerly 26cccfeea72d00040b6ff379b12158bba9f339d2 [formerly 2ba58a3576 ]]
Former-commit-id: 8c6c58e31355710e22a13ff534f4c47d0ed7d0b0 [formerly 26b7d083ec ]
Former-commit-id: e57e7237a9
|
2012-09-13 12:08:11 -05:00 |
|
Steve Harris
|
7a4eb9bf41
|
12.10.1-3 baseline (better than previous which was missing changeset 7d75620)
Former-commit-id: bbc20f4a68 [formerly 22dac5c82e ] [formerly 077ced354e ] [formerly bbc20f4a68 [formerly 22dac5c82e ] [formerly 077ced354e ] [formerly fd5e214e72 [formerly 077ced354e [formerly af8ffe73c81cd980843f137800f9fbb453c9e2c0]]]]
Former-commit-id: fd5e214e72
Former-commit-id: 11421048fb [formerly 9f3bd0d4ec ] [formerly bdf8cbe13f96fe312d8ad014285d113e04c8d85a [formerly ba25027ea5 ]]
Former-commit-id: 669f728964989299c9646d57fbe148142a246f5f [formerly 2002a7cb8d ]
Former-commit-id: 6ce314ca65
|
2012-09-12 13:10:36 -05:00 |
|
Steve Harris
|
9d4e230e7a
|
12.10.1-3 baseline
Former-commit-id: 0403e7d0a9 [formerly de1639aea2 ] [formerly 21f430062b ] [formerly 0403e7d0a9 [formerly de1639aea2 ] [formerly 21f430062b ] [formerly 969e7e6dfd [formerly 21f430062b [formerly 1a94c1ca3674c8e4dbb8847de5190efe33da371c]]]]
Former-commit-id: 969e7e6dfd
Former-commit-id: 64699fa90b [formerly f376a4b4db ] [formerly fcb66f8bc7809d9eb8a7989d2e1acbdbe19fb78e [formerly 438d139fdd ]]
Former-commit-id: 477c548d5650883749d49288002c87221b218db7 [formerly faadb51529 ]
Former-commit-id: 5030894212
|
2012-09-11 16:00:38 -05:00 |
|
Steve Harris
|
4ccea19158
|
12.10.1-2 baseline
Former-commit-id: bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly bb190a66a1 [formerly dde1f4c54d ] [formerly 250f0ccac9 ] [formerly a66f3f4b60 [formerly 250f0ccac9 [formerly 3dab4c2eb757ceea21f4db5bb78e8b92767dd18c]]]]
Former-commit-id: a66f3f4b60
Former-commit-id: 406bde9fd0 [formerly ec74f638e5 ] [formerly f7762df316c068a0c6bb3ef9e303f7dbe3b9cd4a [formerly 34d2ddee9d ]]
Former-commit-id: c8612b01cf2efa0937102321eb6c14dfe7097005 [formerly cc3c3dadee ]
Former-commit-id: 5684a84a46
|
2012-09-11 15:50:57 -05:00 |
|
Steve Harris
|
bc97cf788a
|
12.10.1-1 baseline
Former-commit-id: 7248f8b762 [formerly 0abf64b77c ] [formerly 195158c004 ] [formerly 7248f8b762 [formerly 0abf64b77c ] [formerly 195158c004 ] [formerly d708932029 [formerly 195158c004 [formerly 7d17407c5b0a4a3f9b4b083891a5a5975c645810]]]]
Former-commit-id: d708932029
Former-commit-id: 9f4fa7bf83 [formerly e720b8ed31 ] [formerly eb876c43cf6e8b687c0e099c754e050f9cb32001 [formerly 7bd9c63dc7 ]]
Former-commit-id: 93d844e1d6c245b4e49c2fcb70d3a7143c1fc5c2 [formerly d65f35ffe9 ]
Former-commit-id: a924a8347a
|
2012-09-04 12:07:27 -05:00 |
|
Steve Harris
|
e38cbf019b
|
12.9.1-12 baseline
Former-commit-id: 6784576fc9 [formerly 4bf4f0043a ] [formerly 948766c387 ] [formerly 6784576fc9 [formerly 4bf4f0043a ] [formerly 948766c387 ] [formerly 150bc967a5 [formerly 948766c387 [formerly 09035ea929c2e926b2dce13429c29d3fd3707880]]]]
Former-commit-id: 150bc967a5
Former-commit-id: 15fa63819d [formerly 782941ccc1 ] [formerly 4e1215512187f5bc2d7c34ebc42a2aad34e0131f [formerly 9311c1737e ]]
Former-commit-id: 636b0752d8e9909d3f1d52f3fb2dd51e26dcd63d [formerly 38aa573545 ]
Former-commit-id: c1e601dc30
|
2012-09-04 11:47:38 -05:00 |
|
Steve Harris
|
aec9addbfc
|
12.9.1-11 baseline
Former-commit-id: a2bb1dabe0 [formerly d07c18918d ] [formerly 6eb6b0909b ] [formerly a2bb1dabe0 [formerly d07c18918d ] [formerly 6eb6b0909b ] [formerly fc405efab7 [formerly 6eb6b0909b [formerly 046d9078b7aa87ff8df98142556713fe38d95c63]]]]
Former-commit-id: fc405efab7
Former-commit-id: 503b7bf15c [formerly dc5ec3d16d ] [formerly aa38e16cc24dec9189539c27650c276ab78f3c78 [formerly a14374fcd4 ]]
Former-commit-id: eee5809bc6e00f9fe11f73224bc731077cdb1b5b [formerly f401755cde ]
Former-commit-id: 982804ee0e
|
2012-08-30 14:36:12 -05:00 |
|
Steve Harris
|
cba4faf995
|
12.9.1-10 baseline
Former-commit-id: 264d870cbf [formerly bdb45cdfae ] [formerly 3adc50a783 ] [formerly 264d870cbf [formerly bdb45cdfae ] [formerly 3adc50a783 ] [formerly cb9b80f3a0 [formerly 3adc50a783 [formerly 32048810bc091d7ba09a321c36cd5a78b2d4bd39]]]]
Former-commit-id: cb9b80f3a0
Former-commit-id: c704490769 [formerly f43a5af47f ] [formerly eed64ebc552063bbc01aefdaa691a9c27ae700c3 [formerly dc08c5a71a ]]
Former-commit-id: 8b8bb30a759783a20d278f5fb0049d2db76cb8dc [formerly 5bb474d33c ]
Former-commit-id: ede38c4b3f
|
2012-08-30 14:28:27 -05:00 |
|
Steve Harris
|
19a3e251ac
|
12.9.8-10 baseline
Former-commit-id: 1e0507adf8 [formerly c6d64fed20 ] [formerly 4adcf9b970 ] [formerly 1e0507adf8 [formerly c6d64fed20 ] [formerly 4adcf9b970 ] [formerly d3916212a5 [formerly 4adcf9b970 [formerly 73759b3012f024693ae1e8d249518106fd502aca]]]]
Former-commit-id: d3916212a5
Former-commit-id: f551450927 [formerly 31236f0cbf ] [formerly ee1cadb930b986fa3147903e5bfdce42352f94d7 [formerly 98d792c7ab ]]
Former-commit-id: cf72acc278a3c269e1474e5f551254ba9530d096 [formerly 7667f28d7b ]
Former-commit-id: 1a213e2e6d
|
2012-08-30 14:16:26 -05:00 |
|
Steve Harris
|
d5bb93d38f
|
12.9.1-5 baseline (with forgotten bin files now included)
Former-commit-id: e1cf4b0b9a [formerly 7a4f4ac493 ] [formerly b8ab6066f6 ] [formerly e1cf4b0b9a [formerly 7a4f4ac493 ] [formerly b8ab6066f6 ] [formerly b77a4d40d7 [formerly b8ab6066f6 [formerly e977bd92cef6986b14725164c9eaa417ecf359cf]]]]
Former-commit-id: b77a4d40d7
Former-commit-id: fffd905412 [formerly 34fa4b5804 ] [formerly 49afa39c09674dd9b84bfb0d70e9a7be354e2f85 [formerly b2c0dd1abb ]]
Former-commit-id: f3c30482814339d1bee25e242cd37c19e921ea03 [formerly 8f1120f6d8 ]
Former-commit-id: d404638d82
|
2012-08-22 16:00:33 -05:00 |
|
Steve Harris
|
98059f9ef1
|
12.9.1-5 baseline
Former-commit-id: 77cbd6c1e5 [formerly a1d931fd44 ] [formerly 61f269f54c ] [formerly 77cbd6c1e5 [formerly a1d931fd44 ] [formerly 61f269f54c ] [formerly f2fac39428 [formerly 61f269f54c [formerly d85b989f77196d20eb2d2a21cf4daa13d50474ae]]]]
Former-commit-id: f2fac39428
Former-commit-id: d9faed979f [formerly 7fb0b17bd5 ] [formerly 54140b7733222bbc423315196e9781453b12f896 [formerly 72824561cb ]]
Former-commit-id: 84e9e52a92ae5e740b0daf680a98316f7435f7f7 [formerly 9b5c2094ed ]
Former-commit-id: 2d928d328e
|
2012-08-21 15:27:03 -05:00 |
|
Steve Harris
|
867586657b
|
12.9.1-4 baseline
Former-commit-id: 71b024e3a1 [formerly 36c108e960 ] [formerly dcda3a2290 ] [formerly 71b024e3a1 [formerly 36c108e960 ] [formerly dcda3a2290 ] [formerly 33b95fb96d [formerly dcda3a2290 [formerly df38541c9df38c634626ae214f288b606004a768]]]]
Former-commit-id: 33b95fb96d
Former-commit-id: 80655bf0a3 [formerly d7d60cc623 ] [formerly a0362f7c21fdffcde34416e960bbba970227a95e [formerly 9990bf909b ]]
Former-commit-id: e06a87e5baa81edcd3ffe2ce62e1eb2416c1ee57 [formerly de9b64b501 ]
Former-commit-id: 7e1d1f6e08
|
2012-08-15 15:19:10 -05:00 |
|
Steve Harris
|
d7acb65c06
|
12.9.1-3 baseline
Former-commit-id: 8083b81729 [formerly c11f7d396e ] [formerly 36d80b1f60 ] [formerly 8083b81729 [formerly c11f7d396e ] [formerly 36d80b1f60 ] [formerly 84bbf2573e [formerly 36d80b1f60 [formerly 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86]]]]
Former-commit-id: 84bbf2573e
Former-commit-id: 988563a4b6 [formerly a535b51eba ] [formerly 04e06d54a9ad687da3d26555122e216b3426fb97 [formerly edbbacfa8a ]]
Former-commit-id: 60681d51155fd0d8fea0ced04f4dc5174712adca [formerly 8c5c5ad6eb ]
Former-commit-id: 03bb51ed0e
|
2012-08-15 14:26:10 -05:00 |
|
Steve Harris
|
8c620ce4dd
|
12.9.1-2 baseline
Former-commit-id: ecba93c959 [formerly 27871051e3 ] [formerly d1d877d319 ] [formerly ecba93c959 [formerly 27871051e3 ] [formerly d1d877d319 ] [formerly a198b3a807 [formerly d1d877d319 [formerly 4d7a2d3ad046df5dabf1a2ec6c24a37f8bbdc2d2]]]]
Former-commit-id: a198b3a807
Former-commit-id: 8690f264b6 [formerly de4c812834 ] [formerly db9021d4da0353e03ade3f0d5a5eae88fce61247 [formerly 448ed038c2 ]]
Former-commit-id: 007434bc5f036c2f1f728feff774f4546fd4a8a5 [formerly ed416f241e ]
Former-commit-id: adf346e7d3
|
2012-08-15 14:12:24 -05:00 |
|
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
|
9a598e011f
|
Issue #708 - removed extraneous files
Former-commit-id: de3f944384 [formerly d2e6687295 ] [formerly 1a67fdba3f ] [formerly de3f944384 [formerly d2e6687295 ] [formerly 1a67fdba3f ] [formerly fbe7e50417 [formerly 1a67fdba3f [formerly 389c544088260bd6d6d107f51dc36426e9af3229]]]]
Former-commit-id: fbe7e50417
Former-commit-id: 9b2ed5764f [formerly 026a14fc2c ] [formerly 83b6cf98603632c1e675f0b9f9cba42d635a5d2b [formerly eca93e924c ]]
Former-commit-id: 179aacf8a7ccc5440986b45bbe1903e05e0806ed [formerly 6325fcc6f1 ]
Former-commit-id: 52251f3595
|
2012-06-20 08:15:55 -05:00 |
|
Steve Harris
|
232e525e57
|
Merge branch 'master' into ss_sync
Former-commit-id: a18fd2f871 [formerly 5a5db8dc6a ] [formerly d507f3b71d ] [formerly a18fd2f871 [formerly 5a5db8dc6a ] [formerly d507f3b71d ] [formerly 645359deaf [formerly d507f3b71d [formerly 3b20277effa5ff76e68610d2d85afc950aae3387]]]]
Former-commit-id: 645359deaf
Former-commit-id: 5d7a28156d [formerly 0c29bee8e1 ] [formerly faa52b5e6af76bc7945f0e7bfd703b9788e135ca [formerly c778c97bd6 ]]
Former-commit-id: 190b2bc953e4200127e34845882f6c1614215e26 [formerly a6fd9689d5 ]
Former-commit-id: d1b2c73b81
|
2012-06-13 14:56:52 -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 |
|
Steve Harris
|
7780277dc6
|
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 770ccb1520 [formerly 94e6323c0a ] [formerly 132d68acc6 ] [formerly 770ccb1520 [formerly 94e6323c0a ] [formerly 132d68acc6 ] [formerly 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]]]
Former-commit-id: 54a1d9cdbc
Former-commit-id: 1bc33e26e6 [formerly 2c3f9271bf ] [formerly 304f45749b88cc183853e0c60cef2ea2e8139d31 [formerly 4b853c56c6 ]]
Former-commit-id: 8f6b48e74fefd33ca573f4aeadc0712c9df68566 [formerly 2f6a9ef2ac ]
Former-commit-id: 0a5780c005
|
2012-03-29 10:01:55 -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 |
|