+858 -583

xserver/ChangeLog

reviewed

··· 1 1 + commit 31407c0199da877b359b2e37bb371804321279b7 2 2 + Author: José Expósito <jose.exposito89@gmail.com> 3 3 + Date: Tue Jan 16 10:15:15 2024 +0100 4 4 + 5 5 + xserver 21.1.11 6 6 + 7 7 + Signed-off-by: José Expósito <jose.exposito89@gmail.com> 8 8 + 9 9 + commit a4f0e9466f3bc7073a8f0c28a581211c2d7adf0e 10 10 + Author: Olivier Fourdan <ofourdan@redhat.com> 11 11 + Date: Wed Dec 6 11:51:56 2023 +0100 12 12 + 13 13 + ephyr,xwayland: Use the proper private key for cursor 14 14 + 15 15 + The cursor in DIX is actually split in two parts, the cursor itself and 16 16 + the cursor bits, each with their own devPrivates. 17 17 + 18 18 + The cursor itself includes the cursor bits, meaning that the cursor bits 19 19 + devPrivates in within structure of the cursor. 20 20 + 21 21 + Both Xephyr and Xwayland were using the private key for the cursor bits 22 22 + to store the data for the cursor, and when using XSELINUX which comes 23 23 + with its own special devPrivates, the data stored in that cursor bits' 24 24 + devPrivates would interfere with the XSELINUX devPrivates data and the 25 25 + SELINUX security ID would point to some other unrelated data, causing a 26 26 + crash in the XSELINUX code when trying to (re)use the security ID. 27 27 + 28 28 + CVE-2024-0409 29 29 + 30 30 + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> 31 31 + Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 32 32 + (cherry picked from commit 2ef0f1116c65d5cb06d7b6d83f8a1aea702c94f7) 33 33 + 34 34 + commit 8d825f72da71d6c38cbb02cf2ee2dd9e0e0f50f2 35 35 + Author: Olivier Fourdan <ofourdan@redhat.com> 36 36 + Date: Wed Dec 6 12:09:41 2023 +0100 37 37 + 38 38 + glx: Call XACE hooks on the GLX buffer 39 39 + 40 40 + The XSELINUX code will label resources at creation by checking the 41 41 + access mode. When the access mode is DixCreateAccess, it will call the 42 42 + function to label the new resource SELinuxLabelResource(). 43 43 + 44 44 + However, GLX buffers do not go through the XACE hooks when created, 45 45 + hence leaving the resource actually unlabeled. 46 46 + 47 47 + When, later, the client tries to create another resource using that 48 48 + drawable (like a GC for example), the XSELINUX code would try to use 49 49 + the security ID of that object which has never been labeled, get a NULL 50 50 + pointer and crash when checking whether the requested permissions are 51 51 + granted for subject security ID. 52 52 + 53 53 + To avoid the issue, make sure to call the XACE hooks when creating the 54 54 + GLX buffers. 55 55 + 56 56 + Credit goes to Donn Seeley <donn@xmission.com> for providing the patch. 57 57 + 58 58 + CVE-2024-0408 59 59 + 60 60 + Signed-off-by: Olivier Fourdan <ofourdan@redhat.com> 61 61 + Acked-by: Peter Hutterer <peter.hutterer@who-t.net> 62 62 + (cherry picked from commit e5e8586a12a3ec915673edffa10dc8fe5e15dac3) 63 63 + 64 64 + commit 5c4816afa7722ea47d1a7dea983a953e7b454d26 65 65 + Author: Peter Hutterer <peter.hutterer@who-t.net> 66 66 + Date: Fri Jan 5 09:40:27 2024 +1000 67 67 + 68 68 + dix: when disabling a master, float disabled slaved devices too 69 69 + 70 70 + Disabling a master device floats all slave devices but we didn't do this 71 71 + to already-disabled slave devices. As a result those devices kept their 72 72 + reference to the master device resulting in access to already freed 73 73 + memory if the master device was removed before the corresponding slave 74 74 + device. 75 75 + 76 76 + And to match this behavior, also forcibly reset that pointer during 77 77 + CloseDownDevices(). 78 78 + 79 79 + Related to CVE-2024-21886, ZDI-CAN-22840 80 80 + 81 81 + (cherry picked from commit 26769aa71fcbe0a8403b7fb13b7c9010cc07c3a8) 82 82 + 83 83 + commit 7b5694368b3f3b039fb523e66b816c1323f3cc39 84 84 + Author: José Expósito <jexposit@redhat.com> 85 85 + Date: Fri Dec 22 18:28:31 2023 +0100 86 86 + 87 87 + Xi: do not keep linked list pointer during recursion 88 88 + 89 89 + The `DisableDevice()` function is called whenever an enabled device 90 90 + is disabled and it moves the device from the `inputInfo.devices` linked 91 91 + list to the `inputInfo.off_devices` linked list. 92 92 + 93 93 + However, its link/unlink operation has an issue during the recursive 94 94 + call to `DisableDevice()` due to the `prev` pointer pointing to a 95 95 + removed device. 96 96 + 97 97 + This issue leads to a length mismatch between the total number of 98 98 + devices and the number of device in the list, leading to a heap 99 99 + overflow and, possibly, to local privilege escalation. 100 100 + 101 101 + Simplify the code that checked whether the device passed to 102 102 + `DisableDevice()` was in `inputInfo.devices` or not and find the 103 103 + previous device after the recursion. 104 104 + 105 105 + CVE-2024-21886, ZDI-CAN-22840 106 106 + 107 107 + This vulnerability was discovered by: 108 108 + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative 109 109 + 110 110 + (cherry picked from commit bc1fdbe46559dd947674375946bbef54dd0ce36b) 111 111 + 112 112 + commit 6236342157b9ddc9a4ebb3438e469a8cb37eaecb 113 113 + Author: Peter Hutterer <peter.hutterer@who-t.net> 114 114 + Date: Thu Jan 4 10:01:24 2024 +1000 115 115 + 116 116 + Xi: flush hierarchy events after adding/removing master devices 117 117 + 118 118 + The `XISendDeviceHierarchyEvent()` function allocates space to store up 119 119 + to `MAXDEVICES` (256) `xXIHierarchyInfo` structures in `info`. 120 120 + 121 121 + If a device with a given ID was removed and a new device with the same 122 122 + ID added both in the same operation, the single device ID will lead to 123 123 + two info structures being written to `info`. 124 124 + 125 125 + Since this case can occur for every device ID at once, a total of two 126 126 + times `MAXDEVICES` info structures might be written to the allocation. 127 127 + 128 128 + To avoid it, once one add/remove master is processed, send out the 129 129 + device hierarchy event for the current state and continue. That event 130 130 + thus only ever has exactly one of either added/removed in it (and 131 131 + optionally slave attached/detached). 132 132 + 133 133 + CVE-2024-21885, ZDI-CAN-22744 134 134 + 135 135 + This vulnerability was discovered by: 136 136 + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative 137 137 + 138 138 + (cherry picked from commit 4a5e9b1895627d40d26045bd0b7ef3dce503cbd1) 139 139 + 140 140 + commit 8887cb1f27c72324b50383b644cefb960e21f5ff 141 141 + Author: Peter Hutterer <peter.hutterer@who-t.net> 142 142 + Date: Thu Dec 21 13:48:10 2023 +1000 143 143 + 144 144 + Xi: when creating a new ButtonClass, set the number of buttons 145 145 + 146 146 + There's a racy sequence where a master device may copy the button class 147 147 + from the slave, without ever initializing numButtons. This leads to a 148 148 + device with zero buttons but a button class which is invalid. 149 149 + 150 150 + Let's copy the numButtons value from the source - by definition if we 151 151 + don't have a button class yet we do not have any other slave devices 152 152 + with more than this number of buttons anyway. 153 153 + 154 154 + CVE-2024-0229, ZDI-CAN-22678 155 155 + 156 156 + This vulnerability was discovered by: 157 157 + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative 158 158 + 159 159 + (cherry picked from commit df3c65706eb169d5938df0052059f3e0d5981b74) 160 160 + 161 161 + commit 7173a8911ebeaa7c9c12bd64a2ba9c8685c6593c 162 162 + Author: Peter Hutterer <peter.hutterer@who-t.net> 163 163 + Date: Mon Dec 18 12:26:20 2023 +1000 164 164 + 165 165 + dix: fix DeviceStateNotify event calculation 166 166 + 167 167 + The previous code only made sense if one considers buttons and keys to 168 168 + be mutually exclusive on a device. That is not necessarily true, causing 169 169 + a number of issues. 170 170 + 171 171 + This function allocates and fills in the number of xEvents we need to 172 172 + send the device state down the wire. This is split across multiple 173 173 + 32-byte devices including one deviceStateNotify event and optional 174 174 + deviceKeyStateNotify, deviceButtonStateNotify and (possibly multiple) 175 175 + deviceValuator events. 176 176 + 177 177 + The previous behavior would instead compose a sequence 178 178 + of [state, buttonstate, state, keystate, valuator...]. This is not 179 179 + protocol correct, and on top of that made the code extremely convoluted. 180 180 + 181 181 + Fix this by streamlining: add both button and key into the deviceStateNotify 182 182 + and then append the key state and button state, followed by the 183 183 + valuators. Finally, the deviceValuator events contain up to 6 valuators 184 184 + per event but we only ever sent through 3 at a time. Let's double that 185 185 + troughput. 186 186 + 187 187 + CVE-2024-0229, ZDI-CAN-22678 188 188 + 189 189 + This vulnerability was discovered by: 190 190 + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative 191 191 + 192 192 + (cherry picked from commit 219c54b8a3337456ce5270ded6a67bcde53553d5) 193 193 + 194 194 + commit c494debaa76c923621e6b9f54bbd59ed47842b30 195 195 + Author: Peter Hutterer <peter.hutterer@who-t.net> 196 196 + Date: Mon Dec 18 14:27:50 2023 +1000 197 197 + 198 198 + dix: Allocate sufficient xEvents for our DeviceStateNotify 199 199 + 200 200 + If a device has both a button class and a key class and numButtons is 201 201 + zero, we can get an OOB write due to event under-allocation. 202 202 + 203 203 + This function seems to assume a device has either keys or buttons, not 204 204 + both. It has two virtually identical code paths, both of which assume 205 205 + they're applying to the first event in the sequence. 206 206 + 207 207 + A device with both a key and button class triggered a logic bug - only 208 208 + one xEvent was allocated but the deviceStateNotify pointer was pushed on 209 209 + once per type. So effectively this logic code: 210 210 + 211 211 + int count = 1; 212 212 + if (button && nbuttons > 32) count++; 213 213 + if (key && nbuttons > 0) count++; 214 214 + if (key && nkeys > 32) count++; // this is basically always true 215 215 + // count is at 2 for our keys + zero button device 216 216 + 217 217 + ev = alloc(count * sizeof(xEvent)); 218 218 + FixDeviceStateNotify(ev); 219 219 + if (button) 220 220 + FixDeviceStateNotify(ev++); 221 221 + if (key) 222 222 + FixDeviceStateNotify(ev++); // santa drops into the wrong chimney here 223 223 + 224 224 + If the device has more than 3 valuators, the OOB is pushed back - we're 225 225 + off by one so it will happen when the last deviceValuator event is 226 226 + written instead. 227 227 + 228 228 + Fix this by allocating the maximum number of events we may allocate. 229 229 + Note that the current behavior is not protocol-correct anyway, this 230 230 + patch fixes only the allocation issue. 231 231 + 232 232 + Note that this issue does not trigger if the device has at least one 233 233 + button. While the server does not prevent a button class with zero 234 234 + buttons, it is very unlikely. 235 235 + 236 236 + CVE-2024-0229, ZDI-CAN-22678 237 237 + 238 238 + This vulnerability was discovered by: 239 239 + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative 240 240 + 241 241 + (cherry picked from commit ece23be888a93b741aa1209d1dbf64636109d6a5) 242 242 + 243 243 + commit 4e78bc3a6e593f70aa5306b314edbec03d2f9081 244 244 + Author: Peter Hutterer <peter.hutterer@who-t.net> 245 245 + Date: Thu Dec 14 11:29:49 2023 +1000 246 246 + 247 247 + dix: allocate enough space for logical button maps 248 248 + 249 249 + Both DeviceFocusEvent and the XIQueryPointer reply contain a bit for 250 250 + each logical button currently down. Since buttons can be arbitrarily mapped 251 251 + to anything up to 255 make sure we have enough bits for the maximum mapping. 252 252 + 253 253 + CVE-2023-6816, ZDI-CAN-22664, ZDI-CAN-22665 254 254 + 255 255 + This vulnerability was discovered by: 256 256 + Jan-Niklas Sohn working with Trend Micro Zero Day Initiative 257 257 + 258 258 + (cherry picked from commit 9e2ecb2af8302dedc49cb6a63ebe063c58a9e7e3) 259 259 + 260 260 + commit c338d19f743ca5872ff74d6f2ce5d37d3b7f4a2a 261 261 + Author: Michael Wyraz <mw@brick4u.de> 262 262 + Date: Fri Oct 14 15:07:27 2022 +0200 263 263 + 264 264 + Removing the code that deletes an existing monitor in RRMonitorAdd 265 265 + 266 266 + In commit 7e1f86d4 monitor support was added to randr. At this time it seemed to be reasonable not to have 267 267 + more than one (virtual) monitor on a particular physical display. The code was never changed since. 268 268 + 269 269 + Nowadays, extremely large displays exists (4k displays, ultra-wide displays). In some use cases it makes sense to 270 270 + split these large physical displays into multiple virtual monitors. An example are ultra-wide screens that can be 271 271 + split into 2 monitors. The change in this commit makes this work. 272 272 + 273 273 + Besides that, removing a monitor in a function that is called "RRMonitorAdd" is bad practice and causes 274 274 + unexpected behaviour. 275 275 + 1 276 commit 15e2409776014b41c77f7da7aeb9520613994d27 2 277 Author: Peter Hutterer <peter.hutterer@who-t.net> 3 278 Date: Wed Dec 13 11:12:59 2023 +1000 ··· 13203 13478 Also add similar to meson.build 13204 13479 13205 13480 commit 29a8baa031a87ef44d1e5320ecec5015d26fd385 13206 13206 - Merge: 2aec5c3c81 56c0a71fdd 13481 13481 + Merge: 2aec5c3c8 56c0a71fd 13207 13482 Author: Aaron Plattner <aplattner@nvidia.com> 13208 13483 Date: Fri May 17 08:39:50 2019 -0700 13209 13484 ··· 31254 31529 Signed-off-by: Keith Packard <keithp@keithp.com> 31255 31530 31256 31531 commit 356db2340f5b473a7191c7969586ca5b0396c48f 31257 31257 - Merge: 9ed5b26354 03d99ef729 31532 31532 + Merge: 9ed5b2635 03d99ef72 31258 31533 Author: Keith Packard <keithp@keithp.com> 31259 31534 Date: Fri Oct 28 09:05:54 2016 -0700 31260 31535 ··· 33195 33470 Signed-off-by: Keith Packard <keithp@keithp.com> 33196 33471 33197 33472 commit 265c4e66533243b60d92cffc7769ecadb0292c8d 33198 33198 - Merge: 3caf671ed2 f5f4d32ac7 33473 33473 + Merge: 3caf671ed f5f4d32ac 33199 33474 Author: Keith Packard <keithp@keithp.com> 33200 33475 Date: Thu Sep 15 21:32:46 2016 -0700 33201 33476 ··· 34380 34655 Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer@amd.com> 34381 34656 34382 34657 commit 387d6b5df3e11de5cb88db8a559128fcb62e4e5a 34383 34383 - Merge: d2558f063a 8bb9d460fb 34658 34658 + Merge: d2558f063 8bb9d460f 34384 34659 Author: Keith Packard <keithp@keithp.com> 34385 34660 Date: Sat Aug 13 09:12:19 2016 -0700 34386 34661 ··· 36579 36854 Signed-off-by: Guilherme Quentel Melo <gqmelo@gmail.com> 36580 36855 36581 36856 commit 266cf39a8f108e2f365a9772f4ee4d9fca88eb36 36582 36582 - Merge: fa7b70a9b8 848089e0dd 36857 36857 + Merge: fa7b70a9b 848089e0d 36583 36858 Author: Adam Jackson <ajax@redhat.com> 36584 36859 Date: Mon Jun 20 11:21:40 2016 -0400 36585 36860 ··· 37222 37497 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 37223 37498 37224 37499 commit 3735ab965a4642273d070840bda4e827991e5219 37225 37225 - Merge: 7c77c42fe8 43dbc556f3 37500 37500 + Merge: 7c77c42fe 43dbc556f 37226 37501 Author: Keith Packard <keithp@keithp.com> 37227 37502 Date: Thu Jun 2 07:47:16 2016 -0700 37228 37503 ··· 42987 43262 Reviewed-by: Adam Jackson <ajax@redhat.com> 42988 43263 42989 43264 commit 5b582a4a0350c253d729efb31b710851ae9a958e 42990 42990 - Merge: 1d4aa67242 27ad21254f 43265 43265 + Merge: 1d4aa6724 27ad21254 42991 43266 Author: Adam Jackson <ajax@redhat.com> 42992 43267 Date: Mon Oct 19 12:23:22 2015 -0400 42993 43268 ··· 43598 43873 Reviewed-by: Michel Dänzer <michel.daenzer@amd.com> 43599 43874 43600 43875 commit dca5770af9e20bb1148374ebfd60931a81b148a2 43601 43601 - Merge: a31bbc450a 21f384b7b8 43876 43876 + Merge: a31bbc450 21f384b7b 43602 43877 Author: Adam Jackson <ajax@redhat.com> 43603 43878 Date: Fri Sep 25 10:23:28 2015 -0400 43604 43879 ··· 44232 44507 Signed-off-by: Adam Jackson <ajax@redhat.com> 44233 44508 44234 44509 commit b25f7d0c165c4d32c73fbdf9080012503d319ba1 44235 44235 - Merge: db1089eafc 1ba4fde101 44510 44510 + Merge: db1089eaf 1ba4fde10 44236 44511 Author: Adam Jackson <ajax@redhat.com> 44237 44512 Date: Mon Sep 21 17:34:48 2015 -0400 44238 44513 ··· 44855 45130 Signed-off-by: Keith Packard <keithp@keithp.com> 44856 45131 44857 45132 commit 7ecdfbf0af3547295b245efa754123db65cabb43 44858 44858 - Merge: bca4f4b56c a0b4f30b1f 45133 45133 + Merge: bca4f4b56 a0b4f30b1 44859 45134 Author: Keith Packard <keithp@keithp.com> 44860 45135 Date: Mon Aug 17 18:53:25 2015 -0700 44861 45136 ··· 45102 45377 Signed-off-by: Eric Anholt <eric@anholt.net> 45103 45378 45104 45379 commit 2fcfa532532fbe4a7f668556808e6245ff4e36bc 45105 45105 - Merge: cb695b0f3b 7b0f940625 45380 45380 + Merge: cb695b0f3 7b0f94062 45106 45381 Author: Eric Anholt <eric@anholt.net> 45107 45382 Date: Fri Jul 17 10:15:01 2015 -0700 45108 45383 ··· 45709 45984 Signed-off-by: Keith Packard <keithp@keithp.com> 45710 45985 45711 45986 commit 991712f1e8deeb6289ee0abd9910e279d6396246 45712 45712 - Merge: 0cd228073a 3c859112d3 45987 45987 + Merge: 0cd228073 3c859112d 45713 45988 Author: Keith Packard <keithp@keithp.com> 45714 45989 Date: Wed Jul 8 10:43:31 2015 -0700 45715 45990 ··· 46261 46536 Signed-off-by: Keith Packard <keithp@keithp.com> 46262 46537 46263 46538 commit 8a8d51358cea782147bb9b5b2e0902b1e47fcf4a 46264 46264 - Merge: b22534d8e6 13c7d53df8 46539 46539 + Merge: b22534d8e 13c7d53df 46265 46540 Author: Keith Packard <keithp@keithp.com> 46266 46541 Date: Mon Jun 29 21:04:53 2015 -0700 46267 46542 46268 46543 Merge remote-tracking branch 'airlied/for-keithp' 46269 46544 46270 46545 commit b22534d8e653575196180970292eaade33c090a8 46271 46271 - Merge: 0a625adeec 780a69aff0 46546 46546 + Merge: 0a625adee 780a69aff 46272 46547 Author: Keith Packard <keithp@keithp.com> 46273 46548 Date: Mon Jun 29 21:04:11 2015 -0700 46274 46549 46275 46550 Merge remote-tracking branch 'jwrdecoede/for-keith' 46276 46551 46277 46552 commit 0a625adeec465d6c7dcdb8622c53157b4e932bb0 46278 46278 - Merge: 84128c10bb 790311cec3 46553 46553 + Merge: 84128c10b 790311cec 46279 46554 Author: Keith Packard <keithp@keithp.com> 46280 46555 Date: Mon Jun 29 21:01:34 2015 -0700 46281 46556 46282 46557 Merge remote-tracking branch 'anholt/glamor-next' 46283 46558 46284 46559 commit 84128c10bb6d34f78f7a4148b3c640748efe58e1 46285 46285 - Merge: 9003a3e5c5 8c86dd5160 46560 46560 + Merge: 9003a3e5c 8c86dd516 46286 46561 Author: Keith Packard <keithp@keithp.com> 46287 46562 Date: Mon Jun 29 20:59:31 2015 -0700 46288 46563 ··· 47306 47581 Signed-off-by: Keith Packard <keithp@keithp.com> 47307 47582 47308 47583 commit 0409b6e6d63e9cfb5dc71bb27de4b1ed0152dd9b 47309 47309 - Merge: c39c3a9750 23702dd268 47584 47584 + Merge: c39c3a975 23702dd26 47310 47585 Author: Keith Packard <keithp@keithp.com> 47311 47586 Date: Mon May 11 16:50:43 2015 -0700 47312 47587 47313 47588 Merge remote-tracking branch 'evelikov/master' 47314 47589 47315 47590 commit c39c3a97508dc384c0757a0990c07b5d7b2fe97a 47316 47316 - Merge: 6b65e96189 7470578520 47591 47591 + Merge: 6b65e9618 747057852 47317 47592 Author: Keith Packard <keithp@keithp.com> 47318 47593 Date: Mon May 11 16:34:48 2015 -0700 47319 47594 ··· 47332 47607 Signed-off-by: Keith Packard <keithp@keithp.com> 47333 47608 47334 47609 commit d7091a21d90cf463ae39ec5e8741123218ec5686 47335 47335 - Merge: c3ce9d8fd4 8fb8bbb306 47610 47610 + Merge: c3ce9d8fd 8fb8bbb30 47336 47611 Author: Keith Packard <keithp@keithp.com> 47337 47612 Date: Mon May 11 15:49:34 2015 -0700 47338 47613 ··· 47400 47675 Signed-off-by: Keith Packard <keithp@keithp.com> 47401 47676 47402 47677 commit 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b 47403 47403 - Merge: 28ff661e73 c7b49bdbb9 47678 47678 + Merge: 28ff661e7 c7b49bdbb 47404 47679 Author: Keith Packard <keithp@keithp.com> 47405 47680 Date: Mon May 11 15:36:53 2015 -0700 47406 47681 ··· 48064 48339 Acked-by: Alex Deucher <alexander.deucher@amd.com> 48065 48340 48066 48341 commit e608f3521eaaab972a3eea62aa04a65958351c1c 48067 48067 - Merge: d3b9c47c84 5de1383070 48342 48342 + Merge: d3b9c47c8 5de138307 48068 48343 Author: Keith Packard <keithp@keithp.com> 48069 48344 Date: Tue Mar 31 09:06:08 2015 -0700 48070 48345 ··· 48136 48411 Signed-off-by: Dave Airlie <airlied@redhat.com> 48137 48412 48138 48413 commit 7088816fee0ca7d609c7bca41ef8c3fc938556f5 48139 48139 - Merge: 95e83ff87a e977b404d7 48414 48414 + Merge: 95e83ff87 e977b404d 48140 48415 Author: Keith Packard <keithp@keithp.com> 48141 48416 Date: Fri Mar 27 06:45:56 2015 -0700 48142 48417 ··· 49625 49900 Signed-off-by: Keith Packard <keithp@keithp.com> 49626 49901 49627 49902 commit 5f2e8ac51ccbf7c02f25c8cb7617df0238418cd1 49628 49628 - Merge: 4e12d7b6f4 4301479508 49903 49903 + Merge: 4e12d7b6f 430147950 49629 49904 Author: Keith Packard <keithp@keithp.com> 49630 49905 Date: Sat Jan 10 14:51:57 2015 +1300 49631 49906 ··· 49709 49984 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 49710 49985 49711 49986 commit 1c01633877caa4239f901f02fbe113926318d030 49712 49712 - Merge: 3573855514 e774663fa5 49987 49987 + Merge: 357385551 e774663fa 49713 49988 Author: Keith Packard <keithp@keithp.com> 49714 49989 Date: Sun Jan 4 17:02:25 2015 -0800 49715 49990 ··· 50452 50727 Signed-off-by: Keith Packard <keithp@keithp.com> 50453 50728 50454 50729 commit 6704bb0ed7a10dabe8ef3bb3adf8b8a7f29a78f0 50455 50455 - Merge: 8aa23f27c7 1559a94395 50730 50730 + Merge: 8aa23f27c 1559a9439 50456 50731 Author: Keith Packard <keithp@keithp.com> 50457 50732 Date: Tue Dec 9 11:47:11 2014 -0800 50458 50733 ··· 51050 51325 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 51051 51326 51052 51327 commit 3e7218a6c23354d66f508b18164cac98a346b3ee 51053 51053 - Merge: 6f4c398a0e bc71081f0e 51328 51328 + Merge: 6f4c398a0 bc71081f0 51054 51329 Author: Keith Packard <keithp@keithp.com> 51055 51330 Date: Mon Dec 8 18:07:55 2014 -0800 51056 51331 51057 51332 Merge remote-tracking branch 'jturney/indirect-glx-fixes' 51058 51333 51059 51334 commit 6f4c398a0e632b0c92e3cb8ee03ca7f5b5cc018e 51060 51060 - Merge: aae6460694 5920433c3a 51335 51335 + Merge: aae646069 5920433c3 51061 51336 Author: Keith Packard <keithp@keithp.com> 51062 51337 Date: Mon Dec 8 18:04:08 2014 -0800 51063 51338 ··· 51375 51650 Signed-off-by: Keith Packard <keithp@keithp.com> 51376 51651 51377 51652 commit ec0ac8970b508adcbc3d104b14a127118e4979d0 51378 51378 - Merge: 65cc0982af 0f88d4e793 51653 51653 + Merge: 65cc0982a 0f88d4e79 51379 51654 Author: Keith Packard <keithp@keithp.com> 51380 51655 Date: Mon Nov 24 15:39:51 2014 -0800 51381 51656 ··· 51921 52196 Signed-off-by: Keith Packard <keithp@keithp.com> 51922 52197 51923 52198 commit 3a123fbdda56b24dc01a2308137144dc960e0d61 51924 51924 - Merge: 9b29fa957a 7ea4a21fee 52199 52199 + Merge: 9b29fa957 7ea4a21fe 51925 52200 Author: Keith Packard <keithp@keithp.com> 51926 52201 Date: Mon Oct 27 15:39:26 2014 -0700 51927 52202 ··· 51964 52239 Signed-off-by: Keith Packard <keithp@keithp.com> 51965 52240 51966 52241 commit 59b12c454d9c4b5a26c6ad87c53abc671b15ce37 51967 51967 - Merge: 5574a0a07e cac4b064f9 52242 52242 + Merge: 5574a0a07 cac4b064f 51968 52243 Author: Keith Packard <keithp@keithp.com> 51969 52244 Date: Mon Oct 27 14:48:55 2014 -0700 51970 52245 ··· 52442 52717 Signed-off-by: Keith Packard <keithp@keithp.com> 52443 52718 52444 52719 commit de55aafa8f6a9e0dec364bec920d6f91ef2b39f0 52445 52445 - Merge: 462bf87c4d c79f824bf6 52720 52720 + Merge: 462bf87c4 c79f824bf 52446 52721 Author: Keith Packard <keithp@keithp.com> 52447 52722 Date: Thu Oct 23 17:28:24 2014 -0700 52448 52723 ··· 52681 52956 Signed-off-by: Keith Packard <keithp@keithp.com> 52682 52957 52683 52958 commit d634ecdf82f244ff8ce75d351fc175792d254e5c 52684 52684 - Merge: 6622f0cb17 7ebf480f5e 52959 52959 + Merge: 6622f0cb1 7ebf480f5 52685 52960 Author: Keith Packard <keithp@keithp.com> 52686 52961 Date: Thu Oct 9 15:08:31 2014 +0200 52687 52962 52688 52963 Merge remote-tracking branch 'ajax/dead-code' 52689 52964 52690 52965 commit 6622f0cb1761501f3287ffa8d3cbca3fd30f9f0c 52691 52691 - Merge: f12e7f4980 5ecd7866f7 52966 52966 + Merge: f12e7f498 5ecd7866f 52692 52967 Author: Keith Packard <keithp@keithp.com> 52693 52968 Date: Thu Oct 9 15:05:26 2014 +0200 52694 52969 52695 52970 Merge remote-tracking branch 'ajax/mi-cleanup' 52696 52971 52697 52972 commit f12e7f4980416b74988052a04d0f2487b2c4a7e9 52698 52698 - Merge: da887726ee aaf5e2d643 52973 52973 + Merge: da887726e aaf5e2d64 52699 52974 Author: Keith Packard <keithp@keithp.com> 52700 52975 Date: Thu Oct 9 14:21:19 2014 +0200 52701 52976 ··· 53073 53348 Signed-off-by: Keith Packard <keithp@keithp.com> 53074 53349 53075 53350 commit e9651e3dbc32650fcaf90888b4cbef81da77cfcd 53076 53076 - Merge: 9bc01dfc70 4433bc6d53 53351 53351 + Merge: 9bc01dfc7 4433bc6d5 53077 53352 Author: Keith Packard <keithp@keithp.com> 53078 53353 Date: Thu Oct 2 10:24:33 2014 -0700 53079 53354 ··· 53145 53420 Signed-off-by: Keith Packard <keithp@keithp.com> 53146 53421 53147 53422 commit 78c27d12e1f4857bfcfc92afbb69d5dd989232b9 53148 53148 - Merge: 6e50bfa706 1d6334dd0c 53423 53423 + Merge: 6e50bfa70 1d6334dd0 53149 53424 Author: Keith Packard <keithp@keithp.com> 53150 53425 Date: Mon Sep 29 13:04:49 2014 -0700 53151 53426 ··· 53602 53877 Signed-off-by: Keith Packard <keithp@keithp.com> 53603 53878 53604 53879 commit eaee6572beefca240c42791f9a3a6e547bedd410 53605 53605 - Merge: e3aa13b8d6 b84d25fd53 53880 53880 + Merge: e3aa13b8d b84d25fd5 53606 53881 Author: Keith Packard <keithp@keithp.com> 53607 53882 Date: Wed Sep 17 15:49:24 2014 -0700 53608 53883 ··· 54289 54564 Signed-off-by: Keith Packard <keithp@keithp.com> 54290 54565 54291 54566 commit 54a1d4db825be90fb7be138e3267a15922d62f03 54292 54292 - Merge: 8f8dcfee20 f92df22a03 54567 54567 + Merge: 8f8dcfee2 f92df22a0 54293 54568 Author: Keith Packard <keithp@keithp.com> 54294 54569 Date: Thu Sep 11 18:27:41 2014 -0700 54295 54570 ··· 54588 54863 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 54589 54864 54590 54865 commit 35dc7c75150733dbcef8a18b6796f49a7c48ebee 54591 54591 - Merge: 3a51418b2d 5f3485b06e 54866 54866 + Merge: 3a51418b2 5f3485b06 54592 54867 Author: Eric Anholt <eric@anholt.net> 54593 54868 Date: Mon Aug 25 15:52:58 2014 -0700 54594 54869 ··· 54799 55074 Signed-off-by: Keith Packard <keithp@keithp.com> 54800 55075 54801 55076 commit d09c9ddb866dea31e2adf82be329d5d3489718f5 54802 54802 - Merge: 606b701c56 ab32ee3589 55077 55077 + Merge: 606b701c5 ab32ee358 54803 55078 Author: Keith Packard <keithp@keithp.com> 54804 55079 Date: Tue Aug 12 16:34:24 2014 -0700 54805 55080 ··· 55806 56081 Signed-off-by: Keith Packard <keithp@keithp.com> 55807 56082 55808 56083 commit 556cdf8fe870bc23e0393c0eed15c86f49a0b9f8 55809 55809 - Merge: 83701c4ee8 1faa766705 56084 56084 + Merge: 83701c4ee 1faa76670 55810 56085 Author: Keith Packard <keithp@keithp.com> 55811 56086 Date: Thu Jul 24 16:51:00 2014 -0700 55812 56087 ··· 56037 56312 Signed-off-by: Keith Packard <keithp@keithp.com> 56038 56313 56039 56314 commit 5c2e9fa3d6c4bdf626fededce866056ba8eca502 56040 56040 - Merge: e678b4971b 6d49548849 56315 56315 + Merge: e678b4971 6d4954884 56041 56316 Author: Keith Packard <keithp@keithp.com> 56042 56317 Date: Thu Jul 17 20:06:21 2014 -0700 56043 56318 56044 56319 Merge remote-tracking branch 'anholt/glamor-next' 56045 56320 56046 56321 commit 6d4954884908ea9894fcfe9836db1ba7bb45be61 56047 56047 - Merge: 9ddcb20f47 55f5bfb578 56322 56322 + Merge: 9ddcb20f4 55f5bfb57 56048 56323 Author: Eric Anholt <eric@anholt.net> 56049 56324 Date: Thu Jul 17 18:00:44 2014 -0700 56050 56325 ··· 56576 56851 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 56577 56852 56578 56853 commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3 56579 56579 - Merge: 9308eafb7d a5499870e2 56854 56854 + Merge: 9308eafb7 a5499870e 56580 56855 Author: Keith Packard <keithp@keithp.com> 56581 56856 Date: Mon Jul 7 16:53:07 2014 -0700 56582 56857 ··· 56827 57102 Signed-off-by: Keith Packard <keithp@keithp.com> 56828 57103 56829 57104 commit 736bed2aaf4bb672b6c7b33146fe84700baf22bd 56830 56830 - Merge: ce581ac3fa d90b5f8301 57105 57105 + Merge: ce581ac3f d90b5f830 56831 57106 Author: Keith Packard <keithp@keithp.com> 56832 57107 Date: Mon Jun 23 14:18:03 2014 -0700 56833 57108 ··· 56866 57141 Signed-off-by: Keith Packard <keithp@keithp.com> 56867 57142 56868 57143 commit ea47341792cf06eda5bbdf0aca48aacc024a5be0 56869 56869 - Merge: 334faabe68 a11bbd875f 57144 57144 + Merge: 334faabe6 a11bbd875 56870 57145 Author: Keith Packard <keithp@keithp.com> 56871 57146 Date: Mon Jun 23 13:50:54 2014 -0700 56872 57147 ··· 57597 57872 Signed-off-by: Keith Packard <keithp@keithp.com> 57598 57873 57599 57874 commit b5526141f78df15bc5df2497bc4b4a17f1a6368d 57600 57600 - Merge: dc8d068847 a205ec3ab7 57875 57875 + Merge: dc8d06884 a205ec3ab 57601 57876 Author: Keith Packard <keithp@keithp.com> 57602 57877 Date: Mon Jun 2 13:08:23 2014 -0700 57603 57878 ··· 57614 57889 Signed-off-by: Keith Packard <keithp@keithp.com> 57615 57890 57616 57891 commit a6ffdc69c4ac45bc39924159c7fab5f02f720f1f 57617 57617 - Merge: 63c48de63b 1c10b37380 57892 57892 + Merge: 63c48de63 1c10b3738 57618 57893 Author: Keith Packard <keithp@keithp.com> 57619 57894 Date: Mon Jun 2 11:30:24 2014 -0700 57620 57895 ··· 57639 57914 Signed-off-by: Keith Packard <keithp@keithp.com> 57640 57915 57641 57916 commit ab47ec9636b21a7f542d2e8612834915e7c8cc64 57642 57642 - Merge: 0df871cf34 cfaf2abbac 57917 57917 + Merge: 0df871cf3 cfaf2abba 57643 57918 Author: Keith Packard <keithp@keithp.com> 57644 57919 Date: Mon Jun 2 11:22:48 2014 -0700 57645 57920 ··· 58019 58294 Reviewed-by: Keith Packard <keithp@keithp.com> 58020 58295 58021 58296 commit d60724b752613ce2ad11c6ae102bf4513f9768ff 58022 58022 - Merge: a5b9757142 15460eaed2 58297 58297 + Merge: a5b975714 15460eaed 58023 58298 Author: Keith Packard <keithp@keithp.com> 58024 58299 Date: Thu May 8 12:58:41 2014 -0700 58025 58300 ··· 58231 58506 Signed-off-by: Keith Packard <keithp@keithp.com> 58232 58507 58233 58508 commit 6bd7ad914470322ddd02b50078e159234ebec643 58234 58234 - Merge: b92a9289fe e06fbe4dc8 58509 58509 + Merge: b92a9289f e06fbe4dc 58235 58510 Author: Keith Packard <keithp@keithp.com> 58236 58511 Date: Tue Apr 29 09:37:37 2014 -0700 58237 58512 ··· 59014 59289 Signed-off-by: Keith Packard <keithp@keithp.com> 59015 59290 59016 59291 commit ba5c2b6c876a15fe18bc1ff1ab4e773c46bc9009 59017 59017 - Merge: 9c86d5f4f6 66b6024740 59292 59292 + Merge: 9c86d5f4f 66b602474 59018 59293 Author: Keith Packard <keithp@keithp.com> 59019 59294 Date: Mon Apr 21 14:59:51 2014 -0700 59020 59295 ··· 59434 59709 Reviewed-by: Eric Anholt <eric@anholt.net> 59435 59710 59436 59711 commit 3028ae6c9aa37168e249e0d847b29f8e3efb05b2 59437 59437 - Merge: bd3de10f86 ec6007e6f7 59712 59712 + Merge: bd3de10f8 ec6007e6f 59438 59713 Author: Keith Packard <keithp@keithp.com> 59439 59714 Date: Wed Apr 9 21:59:17 2014 -0700 59440 59715 ··· 59528 59803 Signed-off-by: Keith Packard <keithp@keithp.com> 59529 59804 59530 59805 commit b4d0bec22c15930abf13a7fb9d684208ccd56b1d 59531 59531 - Merge: 3c34dd3603 6e539d8817 59806 59806 + Merge: 3c34dd360 6e539d881 59532 59807 Author: Keith Packard <keithp@keithp.com> 59533 59808 Date: Thu Apr 3 15:35:01 2014 -0700 59534 59809 ··· 59797 60072 Reviewed-by: Julien Cristau <jcristau@debian.org> 59798 60073 59799 60074 commit 84f977467b514af88019ab2791bf7a74530b54df 59800 59800 - Merge: 9d20d18fb9 98924719d5 60075 60075 + Merge: 9d20d18fb 98924719d 59801 60076 Author: Keith Packard <keithp@keithp.com> 59802 60077 Date: Thu Apr 3 10:44:28 2014 -0700 59803 60078 ··· 59958 60233 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 59959 60234 59960 60235 commit 9d20d18fb9dcc74bfa5392a2da40fd41b3e640d3 59961 59961 - Merge: 8468e24430 bc348bd2c4 60236 60236 + Merge: 8468e2443 bc348bd2c 59962 60237 Author: Keith Packard <keithp@keithp.com> 59963 60238 Date: Mon Mar 31 23:24:56 2014 -0700 59964 60239 ··· 60481 60756 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 60482 60757 60483 60758 commit bda6fdc71c25b0c3f3747f445103a1995a5713f4 60484 60484 - Merge: e46820fb89 78167a98a8 60759 60759 + Merge: e46820fb8 78167a98a 60485 60760 Author: Keith Packard <keithp@keithp.com> 60486 60761 Date: Tue Mar 25 16:06:03 2014 -0700 60487 60762 ··· 60600 60875 Signed-off-by: Keith Packard <keithp@keithp.com> 60601 60876 60602 60877 commit d9fdae5f4a648a10653e18dbc602646f3e22e522 60603 60603 - Merge: 99bee6c054 0e5d2996ac 60878 60878 + Merge: 99bee6c05 0e5d2996a 60604 60879 Author: Keith Packard <keithp@keithp.com> 60605 60880 Date: Sat Mar 22 14:09:00 2014 -0700 60606 60881 ··· 60634 60909 Signed-off-by: Keith Packard <keithp@keithp.com> 60635 60910 60636 60911 commit 1782316744866a181ed92486bb4dca6ac46d40bd 60637 60637 - Merge: 4fb31e4824 2b77b208da 60912 60912 + Merge: 4fb31e482 2b77b208d 60638 60913 Author: Keith Packard <keithp@keithp.com> 60639 60914 Date: Sat Mar 22 13:46:15 2014 -0700 60640 60915 ··· 60868 61143 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 60869 61144 60870 61145 commit 4fb31e4824d46edc80bb49b4065152899faa5ac6 60871 60871 - Merge: d18d3f6d18 0e531fbb97 61146 61146 + Merge: d18d3f6d1 0e531fbb9 60872 61147 Author: Keith Packard <keithp@keithp.com> 60873 61148 Date: Wed Mar 19 06:43:14 2014 -0700 60874 61149 ··· 60884 61159 Reviewed-by: Kristian Høgsberg <krh@bitplanet.net> 60885 61160 60886 61161 commit d18d3f6d18aa7827748f7ba14efd405b525883d0 60887 60887 - Merge: 81a4952d3d 6649d0059e 61162 61162 + Merge: 81a4952d3 6649d0059 60888 61163 Author: Keith Packard <keithp@keithp.com> 60889 61164 Date: Mon Mar 17 17:29:56 2014 -0700 60890 61165 ··· 61543 61818 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 61544 61819 61545 61820 commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4 61546 61546 - Merge: 96a28e9c91 795066477e 61821 61821 + Merge: 96a28e9c9 795066477 61547 61822 Author: Keith Packard <keithp@keithp.com> 61548 61823 Date: Tue Mar 11 22:04:36 2014 -0700 61549 61824 ··· 61903 62178 Signed-off-by: Keith Packard <keithp@keithp.com> 61904 62179 61905 62180 commit 1c61d38528a573caadee2468ee59ea558c822e09 61906 61906 - Merge: 5350ae1d38 bf3543739d 62181 62181 + Merge: 5350ae1d3 bf3543739 61907 62182 Author: Keith Packard <keithp@keithp.com> 61908 62183 Date: Fri Mar 7 22:07:19 2014 -0800 61909 62184 ··· 62442 62717 Signed-off-by: Keith Packard <keithp@keithp.com> 62443 62718 62444 62719 commit 1940508a4af33d44a7a8ef24bbdcd1e31e228dab 62445 62445 - Merge: c85ea92af1 ddeca92749 62720 62720 + Merge: c85ea92af ddeca9274 62446 62721 Author: Keith Packard <keithp@keithp.com> 62447 62722 Date: Mon Feb 24 16:27:52 2014 -0800 62448 62723 ··· 62457 62732 Signed-off-by: Keith Packard <keithp@keithp.com> 62458 62733 62459 62734 commit 0840a303c47b9b10ba8e24e62956da0f1675e963 62460 62460 - Merge: 0f10cfd4b9 3d71df48e7 62735 62735 + Merge: 0f10cfd4b 3d71df48e 62461 62736 Author: Keith Packard <keithp@keithp.com> 62462 62737 Date: Mon Feb 24 09:40:23 2014 -0800 62463 62738 ··· 62823 63098 Signed-off-by: Keith Packard <keithp@keithp.com> 62824 63099 62825 63100 commit 5300212ce8e9364ba26497605f3edc089af20130 62826 62826 - Merge: ae796d43c9 0b193b3ac9 63101 63101 + Merge: ae796d43c 0b193b3ac 62827 63102 Author: Keith Packard <keithp@keithp.com> 62828 63103 Date: Sun Feb 9 16:05:42 2014 -0800 62829 63104 ··· 63386 63661 Signed-off-by: Keith Packard <keithp@keithp.com> 63387 63662 63388 63663 commit da1660deeb9032ecca61f4bcdc9fc2eec2ada445 63389 63389 - Merge: 0fbb3d711e 9fc19168e7 63664 63664 + Merge: 0fbb3d711 9fc19168e 63390 63665 Author: Keith Packard <keithp@keithp.com> 63391 63666 Date: Mon Jan 27 19:02:15 2014 -0800 63392 63667 63393 63668 Merge remote-tracking branch 'whot/for-keith' 63394 63669 63395 63670 commit 0fbb3d711efec5222a57b45a70d28fc98380f3a1 63396 63396 - Merge: 7ddef4f703 b98e49379c 63671 63671 + Merge: 7ddef4f70 b98e49379 63397 63672 Author: Keith Packard <keithp@keithp.com> 63398 63673 Date: Mon Jan 27 14:11:09 2014 -0800 63399 63674 ··· 63881 64156 Reviewed-by: Eric Anholt <eric@anholt.net> 63882 64157 63883 64158 commit 25ebb9dbc9df659dec2bf6c27654a5bad2d11f94 63884 63884 - Merge: 409e8e29fb 71baa466b1 64159 64159 + Merge: 409e8e29f 71baa466b 63885 64160 Author: Keith Packard <keithp@keithp.com> 63886 64161 Date: Wed Jan 22 11:33:53 2014 -0800 63887 64162 63888 64163 Merge remote-tracking branch 'whot/for-keith' 63889 64164 63890 64165 commit 409e8e29fbe16122ba5a4249256fc56e2e68ea93 63891 63891 - Merge: 457bc83549 d6c8d75097 64166 64166 + Merge: 457bc8354 d6c8d7509 63892 64167 Author: Keith Packard <keithp@keithp.com> 63893 64168 Date: Wed Jan 22 11:32:35 2014 -0800 63894 64169 ··· 63916 64191 Signed-off-by: Keith Packard <keithp@keithp.com> 63917 64192 63918 64193 commit 044a6ef2ff5f2c83a80b11e747f62f48830b526b 63919 63919 - Merge: 0b932cf47a 77df653ae3 64194 64194 + Merge: 0b932cf47 77df653ae 63920 64195 Author: Keith Packard <keithp@keithp.com> 63921 64196 Date: Wed Jan 22 11:28:54 2014 -0800 63922 64197 63923 64198 Merge remote-tracking branch 'jeremyhu/master' 63924 64199 63925 64200 commit 0b932cf47a4df8ea0f7488e285d218fe7c10dd77 63926 63926 - Merge: 1d76b02fac 295d41fa2a 64201 64201 + Merge: 1d76b02fa 295d41fa2 63927 64202 Author: Keith Packard <keithp@keithp.com> 63928 64203 Date: Wed Jan 22 11:27:36 2014 -0800 63929 64204 63930 64205 Merge remote-tracking branch 'anholt/xserver-unifdef' 63931 64206 63932 64207 commit 1d76b02fac79c0360ae201e4d1a8ba0e9a00e810 63933 63933 - Merge: 771f390efd 4dd62d7807 64208 64208 + Merge: 771f390ef 4dd62d780 63934 64209 Author: Keith Packard <keithp@keithp.com> 63935 64210 Date: Wed Jan 22 11:22:35 2014 -0800 63936 64211 ··· 64865 65140 Signed-off-by: Keith Packard <keithp@keithp.com> 64866 65141 64867 65142 commit 4b1ead9d3400acc3402c2480d7cc0527750c32f0 64868 64868 - Merge: 4d62646142 929795d50d 65143 65143 + Merge: 4d6264614 929795d50 64869 65144 Author: Keith Packard <keithp@keithp.com> 64870 65145 Date: Thu Dec 19 14:14:59 2013 -0800 64871 65146 ··· 68140 68415 Signed-off-by: Zhigang Gong <zhigang.gong@linux.intel.com> 68141 68416 68142 68417 commit 2dbbe2565052cc024ce0e98918ed34c1239b780a 68143 68143 - Merge: 4d62646142 7982eca622 68418 68418 + Merge: 4d6264614 7982eca62 68144 68419 Author: Eric Anholt <eric@anholt.net> 68145 68420 Date: Wed Dec 18 11:21:07 2013 -0800 68146 68421 ··· 68158 68433 support code outside of glamor for now. 68159 68434 68160 68435 commit 4d62646142718024b0981eb4f1fd0131e829161f 68161 68161 - Merge: f4bfb14f53 81ba89d670 68436 68436 + Merge: f4bfb14f5 81ba89d67 68162 68437 Author: Keith Packard <keithp@keithp.com> 68163 68438 Date: Mon Dec 16 09:27:57 2013 -0800 68164 68439 ··· 69225 69500 Signed-off-by: Keith Packard <keithp@keithp.com> 69226 69501 69227 69502 commit 29240e5cbf6e7f875b128fc7bfc4d56b2350835a 69228 69228 - Merge: 0492deb8f8 8ff7e32c3e 69503 69503 + Merge: 0492deb8f 8ff7e32c3 69229 69504 Author: Keith Packard <keithp@keithp.com> 69230 69505 Date: Thu Nov 14 17:02:04 2013 +0900 69231 69506 ··· 69489 69764 Signed-off-by: Keith Packard <keithp@keithp.com> 69490 69765 69491 69766 commit a239e6faf3fce848ac0d10c48f8e817db68a493c 69492 69492 - Merge: 43e5a43fa8 f70a8bf371 69767 69767 + Merge: 43e5a43fa f70a8bf37 69493 69768 Author: Keith Packard <keithp@keithp.com> 69494 69769 Date: Mon Nov 11 15:26:12 2013 -0800 69495 69770 ··· 69726 70001 Signed-off-by: Keith Packard <keithp@keithp.com> 69727 70002 69728 70003 commit 977e2644b1d9e13b44debcb9a372bbc832ee32a3 69729 69729 - Merge: 66c5ee0ff4 f36f5a65f6 70004 70004 + Merge: 66c5ee0ff f36f5a65f 69730 70005 Author: Keith Packard <keithp@keithp.com> 69731 70006 Date: Fri Nov 1 00:34:18 2013 -0700 69732 70007 ··· 69925 70200 Reviewed-by: Adam Jackson <ajax@redhat.com> 69926 70201 69927 70202 commit 95bf478b78e466002c382bcde7d4d62591e9215d 69928 69928 - Merge: abf5d5ac12 bb745f2b45 70203 70203 + Merge: abf5d5ac1 bb745f2b4 69929 70204 Author: Keith Packard <keithp@keithp.com> 69930 70205 Date: Thu Oct 31 18:18:19 2013 -0700 69931 70206 ··· 69947 70222 Signed-off-by: Keith Packard <keithp@keithp.com> 69948 70223 69949 70224 commit e4636072949a76477fe7c9d54662a0b3536b1372 69950 69950 - Merge: 17ed7ac1fe 5c5c1b7798 70225 70225 + Merge: 17ed7ac1f 5c5c1b779 69951 70226 Author: Keith Packard <keithp@keithp.com> 69952 70227 Date: Thu Oct 31 17:05:48 2013 -0700 69953 70228 ··· 70211 70486 Signed-off-by: Keith Packard <keithp@keithp.com> 70212 70487 70213 70488 commit 1470c0a132806fb2ce817515ad4ddfe66eb7c98f 70214 70214 - Merge: 04ab07ca19 9f4afe7e83 70489 70489 + Merge: 04ab07ca1 9f4afe7e8 70215 70490 Author: Keith Packard <keithp@keithp.com> 70216 70491 Date: Tue Oct 29 21:00:13 2013 -0700 70217 70492 ··· 70259 70534 Signed-off-by: Keith Packard <keithp@keithp.com> 70260 70535 70261 70536 commit b32a4c91ccd479638c2bd2c0143b6ea170c717d1 70262 70262 - Merge: be6680967a c671e935e7 70537 70537 + Merge: be6680967 c671e935e 70263 70538 Author: Keith Packard <keithp@keithp.com> 70264 70539 Date: Tue Oct 29 09:37:30 2013 -0700 70265 70540 ··· 70533 70808 Signed-off-by: Keith Packard <keithp@keithp.com> 70534 70809 70535 70810 commit e3220d7bae4548bf64e5879c981ad070ac1f78f7 70536 70536 - Merge: 73b2660d72 2523a445a0 70811 70811 + Merge: 73b2660d7 2523a445a 70537 70812 Author: Keith Packard <keithp@keithp.com> 70538 70813 Date: Fri Oct 18 17:22:52 2013 -0700 70539 70814 ··· 70543 70818 also merging in the spurious merge at the top of that branch. 70544 70819 70545 70820 commit f8662a133690773692dfa392ecfa3b8b56af8fa9 70546 70546 - Merge: 7cf1b595c8 2523a445a0 70821 70821 + Merge: 7cf1b595c 2523a445a 70547 70822 Author: Peter Hutterer <peter.hutterer@who-t.net> 70548 70823 Date: Fri Oct 18 16:50:12 2013 +1000 70549 70824 ··· 70926 71201 Reviewed-by: Adam Jackson <ajax@redhat.com> 70927 71202 70928 71203 commit 6a9bd103cb993e873cb82664b677ceed73c0bd85 70929 70929 - Merge: ea3b7db4b7 8aae28e3cb 71204 71204 + Merge: ea3b7db4b 8aae28e3c 70930 71205 Author: Keith Packard <keithp@keithp.com> 70931 71206 Date: Mon Oct 7 17:29:38 2013 -0700 70932 71207 ··· 71115 71390 Signed-off-by: Keith Packard <keithp@keithp.com> 71116 71391 71117 71392 commit f3b529bf25db2700addbafc7aa4fc5b126ba9929 71118 71118 - Merge: 4399bd3832 abc2bfca16 71393 71393 + Merge: 4399bd383 abc2bfca1 71119 71394 Author: Keith Packard <keithp@keithp.com> 71120 71395 Date: Fri Oct 4 14:04:48 2013 -0700 71121 71396 ··· 71132 71407 Signed-off-by: Keith Packard <keithp@keithp.com> 71133 71408 71134 71409 commit 9ccb4a63982942fdce19609d2cadbd8e51708462 71135 71135 - Merge: 5d2ec6933f da5e20127a 71410 71410 + Merge: 5d2ec6933 da5e20127 71136 71411 Author: Keith Packard <keithp@keithp.com> 71137 71412 Date: Fri Oct 4 13:54:55 2013 -0700 71138 71413 71139 71414 Merge remote-tracking branch 'whot/for-keith' 71140 71415 71141 71416 commit 5d2ec6933f6bb5116666ca1bfb07f0f20bf2a0b5 71142 71142 - Merge: 7d3d4ae55d 6ee4d9f94a 71417 71417 + Merge: 7d3d4ae55 6ee4d9f94 71143 71418 Author: Keith Packard <keithp@keithp.com> 71144 71419 Date: Fri Oct 4 13:50:04 2013 -0700 71145 71420 ··· 71797 72072 Signed-off-by: Adam Jackson <ajax@redhat.com> 71798 72073 71799 72074 commit 47ff382d1fce25a8b097d45b79489e891f1f1228 71800 71800 - Merge: 6f89ae3e64 3752a81580 72075 72075 + Merge: 6f89ae3e6 3752a8158 71801 72076 Author: Keith Packard <keithp@keithp.com> 71802 72077 Date: Mon Sep 9 15:13:42 2013 -0700 71803 72078 ··· 72728 73003 Signed-off-by: Keith Packard <keithp@keithp.com> 72729 73004 72730 73005 commit f67d022523c59a27f3bf8791aa9ca6624318b1fd 72731 72731 - Merge: 5a36cdd915 9680f6a12d 73006 73006 + Merge: 5a36cdd91 9680f6a12 72732 73007 Author: Keith Packard <keithp@keithp.com> 72733 73008 Date: Tue Aug 6 07:12:12 2013 +0200 72734 73009 ··· 72853 73128 Signed-off-by: Dave Airlie <airlied@redhat.com> 72854 73129 72855 73130 commit ff38bbe81ace85bf675bbaa0a9ca5f3b32ede449 72856 72856 - Merge: bdd1e22cbd 4360514d1c 73131 73131 + Merge: bdd1e22cb 4360514d1 72857 73132 Author: Keith Packard <keithp@keithp.com> 72858 73133 Date: Thu Jul 25 22:50:27 2013 -0700 72859 73134 ··· 73156 73431 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 73157 73432 73158 73433 commit d5ebe20f9ba9569351c4a41449866679fd60ba45 73159 73159 - Merge: 21ea7ebb6a 33f7e60785 73434 73434 + Merge: 21ea7ebb6 33f7e6078 73160 73435 Author: Keith Packard <keithp@keithp.com> 73161 73436 Date: Mon Jul 22 20:34:41 2013 -0700 73162 73437 ··· 73505 73780 Signed-off-by: Keith Packard <keithp@keithp.com> 73506 73781 73507 73782 commit 227015d6544115258b74c31b700f9bd163540e24 73508 73508 - Merge: d9005d58c0 80054fcafb 73783 73783 + Merge: d9005d58c 80054fcaf 73509 73784 Author: Keith Packard <keithp@keithp.com> 73510 73785 Date: Tue Jun 18 10:53:08 2013 -0700 73511 73786 ··· 73680 73955 Signed-off-by: Keith Packard <keithp@keithp.com> 73681 73956 73682 73957 commit cb3018d8a15add48efb3335e1f79b66378166008 73683 73683 - Merge: c76a1b343d 6589f3b55e 73958 73958 + Merge: c76a1b343 6589f3b55 73684 73959 Author: Keith Packard <keithp@keithp.com> 73685 73960 Date: Thu May 23 19:58:46 2013 -0600 73686 73961 73687 73962 Merge remote-tracking branch 'whot/unreviewed' 73688 73963 73689 73964 commit c76a1b343d6a56aa9529e87f0eda8d61355d562b 73690 73690 - Merge: 891123ce9d 9a5ad65330 73965 73965 + Merge: 891123ce9 9a5ad6533 73691 73966 Author: Keith Packard <keithp@keithp.com> 73692 73967 Date: Thu May 23 19:58:36 2013 -0600 73693 73968 73694 73969 Merge remote-tracking branch 'whot/touch-grab-race-condition-56578-v3' 73695 73970 73696 73971 commit 891123ce9dac5e52685b9a921b33d8279ba52956 73697 73697 - Merge: 7e97166c4f 49521edaf8 73972 73972 + Merge: 7e97166c4 49521edaf 73698 73973 Author: Keith Packard <keithp@keithp.com> 73699 73974 Date: Thu May 23 10:30:15 2013 -0600 73700 73975 ··· 74467 74742 Reviewed-by: Keith Packard <keithp@keithp.com> 74468 74743 74469 74744 commit 2746c681639f9512e6e45fb8d0151b996b6aff7f 74470 74470 - Merge: 1e6cf8ec20 9878e097a7 74745 74745 + Merge: 1e6cf8ec2 9878e097a 74471 74746 Author: Keith Packard <keithp@keithp.com> 74472 74747 Date: Mon May 6 10:52:40 2013 -0700 74473 74748 74474 74749 Merge remote-tracking branch 'alanc/master' 74475 74750 74476 74751 commit 1e6cf8ec20d07b73a11116564aba71b4e4291dcd 74477 74477 - Merge: dbfeaf7062 5860408a19 74752 74752 + Merge: dbfeaf706 5860408a1 74478 74753 Author: Keith Packard <keithp@keithp.com> 74479 74754 Date: Mon May 6 10:20:21 2013 -0700 74480 74755 ··· 74841 75116 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> 74842 75117 74843 75118 commit 7ab98bafc9a3426fd40f8ae693430491333ba4fc 74844 74844 - Merge: 53da26afb7 5ab260317a 75119 75119 + Merge: 53da26afb 5ab260317 74845 75120 Author: Keith Packard <keithp@keithp.com> 74846 75121 Date: Wed Apr 24 14:14:45 2013 -0700 74847 75122 74848 75123 Merge remote-tracking branch 'geertu/master' 74849 75124 74850 75125 commit 53da26afb76bcce70b91c5df23d25e7e85c010cf 74851 74851 - Merge: 5ece86e921 d8d3c78b6e 75126 75126 + Merge: 5ece86e92 d8d3c78b6 74852 75127 Author: Keith Packard <keithp@keithp.com> 74853 75128 Date: Wed Apr 24 10:27:19 2013 -0700 74854 75129 74855 75130 Merge remote-tracking branch 'whot/for-keith' 74856 75131 74857 75132 commit 5ece86e921a1df457a9baab6a2357ccda4ad6957 74858 74858 - Merge: ef0a726bc8 22cab8a28a 75133 75133 + Merge: ef0a726bc 22cab8a28 74859 75134 Author: Keith Packard <keithp@keithp.com> 74860 75135 Date: Wed Apr 24 10:23:51 2013 -0700 74861 75136 ··· 75575 75850 Signed-off-by: Keith Packard <keithp@keithp.com> 75576 75851 75577 75852 commit c2ede8f92f0d6f15b1b2a04889cb54cd1728780b 75578 75578 - Merge: 190b032151 7050aae69c 75853 75853 + Merge: 190b03215 7050aae69 75579 75854 Author: Keith Packard <keithp@keithp.com> 75580 75855 Date: Mon Mar 18 11:26:24 2013 -0700 75581 75856 ··· 75599 75874 Signed-off-by: Keith Packard <keithp@keithp.com> 75600 75875 75601 75876 commit 116f020102fd6c2a603069a639b113dfa31b48b7 75602 75602 - Merge: cf89aa5374 0f537da72d 75877 75877 + Merge: cf89aa537 0f537da72 75603 75878 Author: Keith Packard <keithp@keithp.com> 75604 75879 Date: Mon Mar 18 11:18:58 2013 -0700 75605 75880 ··· 75868 76143 Signed-off-by: Keith Packard <keithp@keithp.com> 75869 76144 75870 76145 commit 604169af8b67afc74a292cdb9070a3a1f2d7c536 75871 75871 - Merge: 8f4640bdb9 6ea59dc2d8 76146 76146 + Merge: 8f4640bdb 6ea59dc2d 75872 76147 Author: Keith Packard <keithp@keithp.com> 75873 76148 Date: Mon Mar 4 21:09:59 2013 -0800 75874 76149 ··· 76067 76342 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> 76068 76343 76069 76344 commit 88517ced1fa2e621be2d05a319b522b3111da516 76070 76070 - Merge: 82425c66e7 73974dd7ea 76345 76345 + Merge: 82425c66e 73974dd7e 76071 76346 Author: Peter Hutterer <peter.hutterer@who-t.net> 76072 76347 Date: Fri Feb 15 11:58:52 2013 +1000 76073 76348 ··· 76190 76465 Reviewed-by: Mark Kettenis <kettenis@openbsd.org> 76191 76466 76192 76467 commit 90642948cc78834d95f7a3bddaac7ff77b68ed7e 76193 76193 - Merge: 9a35d4240e eda7dbff5a 76468 76468 + Merge: 9a35d4240 eda7dbff5 76194 76469 Author: Keith Packard <keithp@keithp.com> 76195 76470 Date: Thu Feb 14 11:05:48 2013 -0800 76196 76471 ··· 76426 76701 Reviewed-by: Keith Packard <keithp@keithp.com> 76427 76702 76428 76703 commit 0d5bb882600ee7734af034fbea935a79d21d1e70 76429 76429 - Merge: b33fcb1497 61a99aff9d 76704 76704 + Merge: b33fcb149 61a99aff9 76430 76705 Author: Peter Hutterer <peter.hutterer@who-t.net> 76431 76706 Date: Fri Feb 8 14:10:52 2013 +1000 76432 76707 ··· 76858 77133 Signed-off-by: Keith Packard <keithp@keithp.com> 76859 77134 76860 77135 commit 069d8ed3eb659c48dd2b0f8b7b8c11f092fdb362 76861 76861 - Merge: 591c06277b d6dcde7a03 77136 77136 + Merge: 591c06277 d6dcde7a0 76862 77137 Author: Keith Packard <keithp@keithp.com> 76863 77138 Date: Sun Jan 20 15:58:38 2013 -0800 76864 77139 76865 77140 Merge remote-tracking branch 'jturney/xserver-next' 76866 77141 76867 77142 commit 591c06277bb120ab9615633f2d28addbd3a2aa5f 76868 76868 - Merge: 6703a7c7cf fa6ab7d9b2 77143 77143 + Merge: 6703a7c7c fa6ab7d9b 76869 77144 Author: Keith Packard <keithp@keithp.com> 76870 77145 Date: Sun Jan 20 15:52:26 2013 -0800 76871 77146 ··· 77048 77323 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 77049 77324 77050 77325 commit fa6ab7d9b2d7fd8184f1e068360607845f5c33ab 77051 77051 - Merge: adde4e6448 0e1ab433f4 77326 77326 + Merge: adde4e644 0e1ab433f 77052 77327 Author: Peter Hutterer <peter.hutterer@who-t.net> 77053 77328 Date: Fri Jan 11 14:58:17 2013 +1000 77054 77329 ··· 77465 77740 Signed-off-by: Keith Packard <keithp@keithp.com> 77466 77741 77467 77742 commit 2a0b544f5c09f79e4ab04ea8103a5ecf59ee2e7b 77468 77468 - Merge: 0eb1559eb2 ba4bb3bc1b 77743 77743 + Merge: 0eb1559eb ba4bb3bc1 77469 77744 Author: Keith Packard <keithp@keithp.com> 77470 77745 Date: Wed Dec 19 12:26:00 2012 -0800 77471 77746 77472 77747 Merge remote-tracking branch 'jeremyhu/master' 77473 77748 77474 77749 commit 0eb1559eb29d11e63c2b33e317590a88d86fe313 77475 77475 - Merge: 386e4d76ba ea1d76d1b6 77750 77750 + Merge: 386e4d76b ea1d76d1b 77476 77751 Author: Keith Packard <keithp@keithp.com> 77477 77752 Date: Wed Dec 19 12:21:31 2012 -0800 77478 77753 ··· 77482 77757 whitespace. 77483 77758 77484 77759 commit 386e4d76baaffe226d2d561ff936509454eb0ac2 77485 77485 - Merge: 014a5c8a9d 9ff2e83151 77760 77760 + Merge: 014a5c8a9 9ff2e8315 77486 77761 Author: Keith Packard <keithp@keithp.com> 77487 77762 Date: Wed Dec 19 12:17:59 2012 -0800 77488 77763 77489 77764 Merge remote-tracking branch 'alanc/master' 77490 77765 77491 77766 commit 014a5c8a9d86f2f992183bff9106354fac2c3b0e 77492 77492 - Merge: f793b5fd3e 2eefa5d6e8 77767 77767 + Merge: f793b5fd3 2eefa5d6e 77493 77768 Author: Keith Packard <keithp@keithp.com> 77494 77769 Date: Wed Dec 19 12:09:31 2012 -0800 77495 77770 ··· 77651 77926 Signed-off-by: Keith Packard <keithp@keithp.com> 77652 77927 77653 77928 commit 6d508b81857edaed03c7ee06410434ea56d9b701 77654 77654 - Merge: d982d87743 bb6f3514ca 77929 77929 + Merge: d982d8774 bb6f3514c 77655 77930 Author: Keith Packard <keithp@keithp.com> 77656 77931 Date: Mon Dec 17 11:45:45 2012 -0800 77657 77932 ··· 77661 77936 reviewed them... 77662 77937 77663 77938 commit d982d877436377597b8ed04bca1438d2edaf53ee 77664 77664 - Merge: da3eaf6bdb 6b4aa8a359 77939 77939 + Merge: da3eaf6bd 6b4aa8a35 77665 77940 Author: Keith Packard <keithp@keithp.com> 77666 77941 Date: Mon Dec 17 10:56:12 2012 -0800 77667 77942 ··· 78011 78286 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 78012 78287 78013 78288 commit bb6f3514ca17d993c1af380e8d4480d61e5bbcae 78014 78014 - Merge: f961c3a3b9 08da994a08 78289 78289 + Merge: f961c3a3b 08da994a0 78015 78290 Author: Peter Hutterer <peter.hutterer@who-t.net> 78016 78291 Date: Wed Dec 12 17:25:28 2012 +1000 78017 78292 78018 78293 Merge branch 'stack-smash-on-touchpoint' into for-keith 78019 78294 78020 78295 commit f961c3a3b9dfbe1201da317c24797ba7f979731e 78021 78021 - Merge: 36740d02b9 39f19b3f3b 78296 78296 + Merge: 36740d02b 39f19b3f3 78022 78297 Author: Peter Hutterer <peter.hutterer@who-t.net> 78023 78298 Date: Wed Dec 12 17:25:23 2012 +1000 78024 78299 ··· 78219 78494 Tested-by: Frank Roscher <Frank-Roscher@gmx.net> 78220 78495 78221 78496 commit b51a1bd2766e7dc975ca8f1cacc3f8bd0e1a68a3 78222 78222 - Merge: e9ea96d6a8 ce6b652929 78497 78497 + Merge: e9ea96d6a ce6b65292 78223 78498 Author: Keith Packard <keithp@keithp.com> 78224 78499 Date: Fri Nov 30 09:31:46 2012 -0800 78225 78500 ··· 78241 78516 Signed-off-by: Keith Packard <keithp@keithp.com> 78242 78517 78243 78518 commit ce6b6529290f7d42717aad3fd8a83aaaaf8962de 78244 78244 - Merge: 6e18599d69 3b9f1c7017 78519 78519 + Merge: 6e18599d6 3b9f1c701 78245 78520 Author: Peter Hutterer <peter.hutterer@who-t.net> 78246 78521 Date: Thu Nov 29 14:49:22 2012 +1000 78247 78522 ··· 78354 78629 Signed-off-by: Dave Airlie <airlied@redhat.com> 78355 78630 78356 78631 commit 1712a45422a63f11b2146541279616fcfda09ec6 78357 78357 - Merge: e54f71a2c7 338bec3005 78632 78632 + Merge: e54f71a2c 338bec300 78358 78633 Author: Keith Packard <keithp@keithp.com> 78359 78634 Date: Wed Nov 28 07:54:13 2012 -0800 78360 78635 ··· 78487 78762 Signed-off-by: Keith Packard <keithp@keithp.com> 78488 78763 78489 78764 commit d50a94568e06a06df682a0028579d37a7b209d15 78490 78490 - Merge: 87b60efb85 cf05db8dde 78765 78765 + Merge: 87b60efb8 cf05db8dd 78491 78766 Author: Keith Packard <keithp@keithp.com> 78492 78767 Date: Tue Nov 27 15:14:26 2012 -0800 78493 78768 ··· 78892 79167 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 78893 79168 78894 79169 commit 6a6c3afe71ac82a93d9fd0034dd5bbdcf0eae1ea 78895 78895 - Merge: 14c9e245ba 6f145084d5 79170 79170 + Merge: 14c9e245b 6f145084d 78896 79171 Author: Keith Packard <keithp@keithp.com> 78897 79172 Date: Sun Nov 18 21:50:20 2012 -0800 78898 79173 ··· 79002 79277 Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> 79003 79278 79004 79279 commit 011f8458805e443ac9130865d2840a929a00cabf 79005 79005 - Merge: 54ba26cb1f b4e44b285e 79280 79280 + Merge: 54ba26cb1 b4e44b285 79006 79281 Author: Keith Packard <keithp@keithp.com> 79007 79282 Date: Mon Nov 5 17:16:07 2012 -0800 79008 79283 ··· 79329 79604 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 79330 79605 79331 79606 commit 04f980ead5e9af066143a921e0a0e98f26f28ee5 79332 79332 - Merge: a194630f7f a4941ce496 79607 79607 + Merge: a194630f7 a4941ce49 79333 79608 Author: Keith Packard <keithp@keithp.com> 79334 79609 Date: Mon Nov 5 08:45:21 2012 -0800 79335 79610 ··· 79379 79654 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 79380 79655 79381 79656 commit a194630f7f7b287cb4ea4a459df0745f4c0d4c1a 79382 79382 - Merge: 74a3130426 d511a3016a 79657 79657 + Merge: 74a313042 d511a3016 79383 79658 Author: Keith Packard <keithp@keithp.com> 79384 79659 Date: Thu Nov 1 13:38:54 2012 -0700 79385 79660 ··· 79414 79689 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 79415 79690 79416 79691 commit 74a3130426d7e1b456e45daa517769cd3e4b58c0 79417 79417 - Merge: 1ca096d5e0 f32ad6dd31 79692 79692 + Merge: 1ca096d5e f32ad6dd3 79418 79693 Author: Keith Packard <keithp@keithp.com> 79419 79694 Date: Mon Oct 29 09:09:16 2012 -0700 79420 79695 ··· 79568 79843 Reviewed-by: Jon TURNEY <jon.turney@dronecode.org.uk> 79569 79844 79570 79845 commit 53830281b4da096f9c13107d73ec9c76ff1d14cc 79571 79571 - Merge: abc2ef590c 9cbcb5bd6a 79846 79846 + Merge: abc2ef590 9cbcb5bd6 79572 79847 Author: Keith Packard <keithp@keithp.com> 79573 79848 Date: Fri Oct 26 18:04:34 2012 -0700 79574 79849 79575 79850 Merge remote-tracking branch 'sandmann/for-keithp' 79576 79851 79577 79852 commit abc2ef590c7cb33ebe21726f83b7347406975f95 79578 79578 - Merge: 0e85e5e628 c5396ec05a 79853 79853 + Merge: 0e85e5e62 c5396ec05 79579 79854 Author: Keith Packard <keithp@keithp.com> 79580 79855 Date: Fri Oct 26 17:11:58 2012 -0700 79581 79856 ··· 80386 80661 Reviewed-by: Julien Cristau <jcristau@debian.org> 80387 80662 80388 80663 commit 8367dd9736d74eca971da345c2bf559ce5bbf649 80389 80389 - Merge: 36c18bb81b 7998e26159 80664 80664 + Merge: 36c18bb81 7998e2615 80390 80665 Author: Keith Packard <keithp@keithp.com> 80391 80666 Date: Thu Oct 4 13:08:35 2012 -0700 80392 80667 ··· 80450 80725 Signed-off-by: Keith Packard <keithp@keithp.com> 80451 80726 80452 80727 commit f179b13b91c8891254d31345ee04e773839e6b87 80453 80453 - Merge: 4dd5989d15 3d2b768efa 80728 80728 + Merge: 4dd5989d1 3d2b768ef 80454 80729 Author: Keith Packard <keithp@keithp.com> 80455 80730 Date: Thu Oct 4 11:39:46 2012 -0700 80456 80731 ··· 80602 80877 Reviewed-by: Ian Romanick <ian.d.romanick@intel.com> 80603 80878 80604 80879 commit 4dd5989d15465f3f3480b521d4e36673972fa24a 80605 80605 - Merge: 0b02150c27 506e3437c7 80880 80880 + Merge: 0b02150c2 506e3437c 80606 80881 Author: Keith Packard <keithp@keithp.com> 80607 80882 Date: Mon Sep 24 11:43:01 2012 -0700 80608 80883 ··· 80638 80913 Signed-off-by: Keith Packard <keithp@keithp.com> 80639 80914 80640 80915 commit 7722bcbab2507d263c7685b15cccbfdd52fc3a24 80641 80641 - Merge: 4dc2a76740 f54987de97 80916 80916 + Merge: 4dc2a7674 f54987de9 80642 80917 Author: Keith Packard <keithp@keithp.com> 80643 80918 Date: Sun Sep 23 16:04:13 2012 -0700 80644 80919 ··· 80884 81159 Signed-off-by: Adam Jackson <ajax@redhat.com> 80885 81160 80886 81161 commit d01921ec18c21f21d377b60626cc2d3418b84a7c 80887 80887 - Merge: 70e5766874 245e7e0361 81162 81162 + Merge: 70e576687 245e7e036 80888 81163 Author: Keith Packard <keithp@keithp.com> 80889 81164 Date: Thu Sep 20 17:26:48 2012 +0200 80890 81165 ··· 81071 81346 Signed-off-by: Keith Packard <keithp@keithp.com> 81072 81347 81073 81348 commit 856f80c8d7f22b979c72d9c70b70187df6004a03 81074 81074 - Merge: 0db936a5b7 b8ab93dfbc 81349 81349 + Merge: 0db936a5b b8ab93dfb 81075 81350 Author: Keith Packard <keithp@keithp.com> 81076 81351 Date: Wed Sep 5 11:02:58 2012 -0700 81077 81352 ··· 81216 81491 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 81217 81492 81218 81493 commit a557edca6152ad09c685a00e01534c35a1f00f2e 81219 81219 - Merge: 6619f5c0e1 24ffcfcded 81494 81494 + Merge: 6619f5c0e 24ffcfcde 81220 81495 Author: Keith Packard <keithp@keithp.com> 81221 81496 Date: Mon Aug 27 08:06:09 2012 -0700 81222 81497 ··· 81408 81683 Signed-off-by: Adam Jackson <ajax@redhat.com> 81409 81684 81410 81685 commit ad5fe2d9614959b68bf71e23abf7e5abac9c2734 81411 81411 - Merge: 16d8da5ca9 99b94af1ff 81686 81686 + Merge: 16d8da5ca 99b94af1f 81412 81687 Author: Keith Packard <keithp@keithp.com> 81413 81688 Date: Wed Aug 15 13:29:17 2012 -0700 81414 81689 ··· 81549 81824 Signed-off-by: Keith Packard <keithp@keithp.com> 81550 81825 81551 81826 commit 02f94b2d446f6700f791f318c551ac835af8445a 81552 81552 - Merge: 360fa7736b 7f09126e06 81827 81827 + Merge: 360fa7736 7f09126e0 81553 81828 Author: Keith Packard <keithp@keithp.com> 81554 81829 Date: Mon Aug 6 16:52:12 2012 -0700 81555 81830 81556 81831 Merge remote-tracking branch 'whot/for-keith' 81557 81832 81558 81833 commit 360fa7736b214cae3ccd39feb4dc87b9e7e9734c 81559 81559 - Merge: 2100e72388 ac09a4a091 81834 81834 + Merge: 2100e7238 ac09a4a09 81560 81835 Author: Keith Packard <keithp@keithp.com> 81561 81836 Date: Mon Aug 6 16:42:34 2012 -0700 81562 81837 81563 81838 Merge remote-tracking branch 'airlied/for-keithp' 81564 81839 81565 81840 commit 2100e72388a3dc174093d80c9723f021b4614d17 81566 81566 - Merge: 4a6f42dda0 c37c65052f 81841 81841 + Merge: 4a6f42dda c37c65052 81567 81842 Author: Keith Packard <keithp@keithp.com> 81568 81843 Date: Mon Aug 6 16:40:54 2012 -0700 81569 81844 ··· 81779 82054 Reviewed-by: Keith Packard <keithp@keithp.com> 81780 82055 81781 82056 commit 94b514d5e4b376d05e106eb3853da511256e8545 81782 81782 - Merge: 7d87545ba7 7328900042 82057 82057 + Merge: 7d87545ba 732890004 81783 82058 Author: Keith Packard <keithp@keithp.com> 81784 82059 Date: Mon Aug 6 15:13:17 2012 -0700 81785 82060 81786 82061 Merge remote-tracking branch 'whot/for-keith' 81787 82062 81788 82063 commit 7d87545ba7395ade507cca7bdca7052b26ed18d8 81789 81789 - Merge: ad707a7dcc 988d7ace19 82064 82064 + Merge: ad707a7dc 988d7ace1 81790 82065 Author: Keith Packard <keithp@keithp.com> 81791 82066 Date: Mon Aug 6 15:11:13 2012 -0700 81792 82067 81793 82068 Merge remote-tracking branch 'jturney/master' 81794 82069 81795 82070 commit ad707a7dcc65c30e030c7600b54f734090e56a91 81796 81796 - Merge: 5a51cb86f3 884f51e977 82071 82071 + Merge: 5a51cb86f 884f51e97 81797 82072 Author: Keith Packard <keithp@keithp.com> 81798 82073 Date: Mon Aug 6 15:08:01 2012 -0700 81799 82074 ··· 82264 82539 Signed-off-by: Keith Packard <keithp@keithp.com> 82265 82540 82266 82541 commit 20b4d90f32b3ca5def5be2fdf04a91ae6c47f125 82267 82267 - Merge: 83df169538 fd228d3184 82542 82542 + Merge: 83df16953 fd228d318 82268 82543 Author: Keith Packard <keithp@keithp.com> 82269 82544 Date: Wed Jul 25 13:52:35 2012 -0700 82270 82545 ··· 82359 82634 Signed-off-by: Keith Packard <keithp@keithp.com> 82360 82635 82361 82636 commit beeea70495a8d5c4afc1b1eb2cc06a24ab1a986d 82362 82362 - Merge: 6e438a0e18 6910280297 82637 82637 + Merge: 6e438a0e1 691028029 82363 82638 Author: Keith Packard <keithp@keithp.com> 82364 82639 Date: Tue Jul 17 12:17:39 2012 -0700 82365 82640 82366 82641 Merge remote-tracking branch 'alanc/master' 82367 82642 82368 82643 commit 6e438a0e183f5a6c22070746c038af53d5b935ca 82369 82369 - Merge: 5884e7dede 75966a4186 82644 82644 + Merge: 5884e7ded 75966a418 82370 82645 Author: Keith Packard <keithp@keithp.com> 82371 82646 Date: Tue Jul 17 12:12:53 2012 -0700 82372 82647 ··· 82731 83006 Signed-off-by: Keith Packard <keithp@keithp.com> 82732 83007 82733 83008 commit 746193a7f10f11cccae05c98b933aadf58fc7375 82734 82734 - Merge: a2d0829531 2b74949ad0 83009 83009 + Merge: a2d082953 2b74949ad 82735 83010 Author: Keith Packard <keithp@keithp.com> 82736 83011 Date: Thu Jul 12 15:10:51 2012 -0700 82737 83012 ··· 82783 83058 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 82784 83059 82785 83060 commit 656e5fea6c9ca15f932889edcc590dd01c881945 82786 82786 - Merge: 8b820f221a 1720cd9bad 83061 83061 + Merge: 8b820f221 1720cd9ba 82787 83062 Author: Keith Packard <keithp@keithp.com> 82788 83063 Date: Thu Jul 12 08:26:35 2012 -0700 82789 83064 ··· 82985 83260 Signed-off-by: Keith Packard <keithp@keithp.com> 82986 83261 82987 83262 commit 6e12cb147da58bd12a158807b2cd5afac32ae70f 82988 82988 - Merge: 532fbc29c9 023127915e 83263 83263 + Merge: 532fbc29c 023127915 82989 83264 Author: Keith Packard <keithp@keithp.com> 82990 83265 Date: Tue Jul 10 00:52:11 2012 -0700 82991 83266 ··· 84668 84943 Signed-off-by: Dave Airlie <airlied@redhat.com> 84669 84944 84670 84945 commit 4d24192bd24fb20d16d0054d77bffda883faeb79 84671 84671 - Merge: 7c9d8cbd36 74b786f7ce 84946 84946 + Merge: 7c9d8cbd3 74b786f7c 84672 84947 Author: Keith Packard <keithp@keithp.com> 84673 84948 Date: Fri Jul 6 12:17:17 2012 -0700 84674 84949 ··· 85200 85475 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 85201 85476 85202 85477 commit d84f0f823eeeecdf0498aadd3fbb1d11dabc0837 85203 85203 - Merge: 12bfb4cf1b d04dfe3f75 85478 85478 + Merge: 12bfb4cf1 d04dfe3f7 85204 85479 Author: Peter Hutterer <peter.hutterer@who-t.net> 85205 85480 Date: Wed Jul 4 21:23:48 2012 +1000 85206 85481 ··· 85318 85593 Reviewed-by: Keith Packard <keithp@keithp.com> 85319 85594 85320 85595 commit 24525d96a3b9dba67eb75042500b2f208a2cc246 85321 85321 - Merge: 4cd91bd4c6 35e3d22915 85596 85596 + Merge: 4cd91bd4c 35e3d2291 85322 85597 Author: Keith Packard <keithp@keithp.com> 85323 85598 Date: Mon Jul 2 22:35:39 2012 -0700 85324 85599 ··· 85638 85913 Signed-off-by: Keith Packard <keithp@keithp.com> 85639 85914 85640 85915 commit 8b4f0a4fdd6c15f49458bc3a8c3135b8c389240d 85641 85641 - Merge: 59294a2179 d642e71287 85916 85916 + Merge: 59294a217 d642e7128 85642 85917 Author: Keith Packard <keithp@keithp.com> 85643 85918 Date: Thu Jun 28 10:38:26 2012 -0700 85644 85919 85645 85920 Merge remote-tracking branch 'jturney/master' 85646 85921 85647 85922 commit 59294a2179bd5bb996693af004b470932df00ac6 85648 85648 - Merge: 855003c333 191b630656 85923 85923 + Merge: 855003c33 191b63065 85649 85924 Author: Keith Packard <keithp@keithp.com> 85650 85925 Date: Thu Jun 28 10:11:44 2012 -0700 85651 85926 ··· 85877 86152 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 85878 86153 85879 86154 commit 3ef3ce069d52dcfa932c90ccd30854a8d9daa15a 85880 85880 - Merge: a0c8716cdc ff541e0a1f 86155 86155 + Merge: a0c8716cd ff541e0a1 85881 86156 Author: Keith Packard <keithp@keithp.com> 85882 86157 Date: Thu Jun 21 08:52:34 2012 -0700 85883 86158 ··· 86016 86291 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> 86017 86292 86018 86293 commit 8dc70acbf3d82611ac9ec1ec2a52edcc01934850 86019 86019 - Merge: ffb47a123d b59adc9c24 86294 86294 + Merge: ffb47a123 b59adc9c2 86020 86295 Author: Keith Packard <keithp@keithp.com> 86021 86296 Date: Thu Jun 14 13:04:29 2012 -0700 86022 86297 86023 86298 Merge remote-tracking branch 'alanc/master' 86024 86299 86025 86300 commit ffb47a123ddd1233fb4229cf23483652065c5e82 86026 86026 - Merge: db9d2b8a50 b840ba5f54 86301 86301 + Merge: db9d2b8a5 b840ba5f5 86027 86302 Author: Keith Packard <keithp@keithp.com> 86028 86303 Date: Thu Jun 14 13:01:17 2012 -0700 86029 86304 ··· 86042 86317 Signed-off-by: Keith Packard <keithp@keithp.com> 86043 86318 86044 86319 commit 6d86b64dbaef5a16712fd1fdc3157f716d238877 86045 86045 - Merge: 812786f4d4 4c68f5d395 86320 86320 + Merge: 812786f4d 4c68f5d39 86046 86321 Author: Keith Packard <keithp@keithp.com> 86047 86322 Date: Thu Jun 14 11:05:22 2012 -0700 86048 86323 ··· 86679 86954 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 86680 86955 86681 86956 commit 3476eb38063473a7a5fcd78e2095e284118de839 86682 86682 - Merge: 78f0d9cdc4 42ae2e8199 86957 86957 + Merge: 78f0d9cdc 42ae2e819 86683 86958 Author: Keith Packard <keithp@keithp.com> 86684 86959 Date: Sun Jun 3 20:24:24 2012 -0700 86685 86960 ··· 86990 87265 Signed-off-by: Keith Packard <keithp@keithp.com> 86991 87266 86992 87267 commit 457fc77691b2df66f6dd3ba10ce7c1b61b9b42a3 86993 86993 - Merge: 2e237c838f 5a3a98fcb7 87268 87268 + Merge: 2e237c838 5a3a98fcb 86994 87269 Author: Keith Packard <keithp@keithp.com> 86995 87270 Date: Tue May 22 10:32:29 2012 -0700 86996 87271 ··· 87210 87485 Reviewed-by: Dave Airlie <airlied@redhat.com> 87211 87486 87212 87487 commit ba883a0f3435d5da82a8134e696c4905eea70f23 87213 87213 - Merge: ae1c48ebc8 acdc4f54ee 87488 87488 + Merge: ae1c48ebc acdc4f54e 87214 87489 Author: Keith Packard <keithp@keithp.com> 87215 87490 Date: Thu May 17 16:49:19 2012 -0700 87216 87491 ··· 87565 87840 Signed-off-by: Dave Airlie <airlied@redhat.com> 87566 87841 87567 87842 commit 3a94b338aaa48b656aae1bb3a5a9d64300c0a093 87568 87568 - Merge: afc153a5b4 c91d00e0f3 87843 87843 + Merge: afc153a5b c91d00e0f 87569 87844 Author: Keith Packard <keithp@keithp.com> 87570 87845 Date: Wed May 9 21:17:16 2012 -0700 87571 87846 ··· 87748 88023 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 87749 88024 87750 88025 commit 97041364a6acb2b66b5cfd06757c90a006ad50e9 87751 87751 - Merge: 19082726cb ee542b8559 88026 88026 + Merge: 19082726c ee542b855 87752 88027 Author: Keith Packard <keithp@keithp.com> 87753 88028 Date: Wed May 2 20:47:25 2012 -0700 87754 88029 ··· 88140 88415 Tested-By: Michal Suchanek <hramrach@gmail.com> 88141 88416 88142 88417 commit d77eb7ee49ef19c2c4c7381d56e9d0f9c3fbc890 88143 88143 - Merge: 31e3c0ff7f c7b1625558 88418 88418 + Merge: 31e3c0ff7 c7b162555 88144 88419 Author: Keith Packard <keithp@keithp.com> 88145 88420 Date: Thu Apr 19 15:48:34 2012 -0500 88146 88421 ··· 88159 88434 Signed-off-by: Keith Packard <keithp@keithp.com> 88160 88435 88161 88436 commit e6308e32fe2b5f74133d4d238ffa512257f6327c 88162 88162 - Merge: 3720aa33ee 51a8d8dd19 88437 88437 + Merge: 3720aa33e 51a8d8dd1 88163 88438 Author: Keith Packard <keithp@keithp.com> 88164 88439 Date: Thu Apr 19 10:45:07 2012 -0500 88165 88440 ··· 88168 88443 Touch input changes from Chase 88169 88444 88170 88445 commit 51a8d8dd19d7496fe84b37a1f0a7a03658120539 88171 88171 - Merge: ebf214876a 00cf1c40b2 88446 88446 + Merge: ebf214876 00cf1c40b 88172 88447 Author: Peter Hutterer <peter.hutterer@who-t.net> 88173 88448 Date: Thu Apr 19 17:03:54 2012 +1000 88174 88449 ··· 88576 88851 cursor: hide cursors on LeaveVT 88577 88852 88578 88853 commit 80fefc42f5e67e6b4a4b440d8991bee7e5f38359 88579 88579 - Merge: 9779b904c7 12188c8a8a 88854 88854 + Merge: 9779b904c 12188c8a8 88580 88855 Author: Keith Packard <keithp@keithp.com> 88581 88856 Date: Sun Apr 15 21:05:30 2012 -0700 88582 88857 ··· 88945 89220 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 88946 89221 88947 89222 commit 7f3997b01a8813c1d7055317eb06111aed8572c9 88948 88948 - Merge: 92d50c38b2 31646d8fa9 89223 89223 + Merge: 92d50c38b 31646d8fa 88949 89224 Author: Keith Packard <keithp@keithp.com> 88950 89225 Date: Mon Mar 26 16:41:52 2012 -0700 88951 89226 ··· 89364 89639 modesetting: fix build against older Xext 89365 89640 89366 89641 commit a7eac500e652f30deffd9dc5e623fab701077738 89367 89367 - Merge: bf876c87a9 d645edd11e 89642 89642 + Merge: bf876c87a d645edd11 89368 89643 Author: Peter Hutterer <peter.hutterer@who-t.net> 89369 89644 Date: Thu Mar 22 13:13:07 2012 +1000 89370 89645 ··· 89498 89773 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 89499 89774 89500 89775 commit bf876c87a9099fdfa63ed599f8ed9a954dd023d9 89501 89501 - Merge: 908ab3d580 c0b0a9bce9 89776 89776 + Merge: 908ab3d58 c0b0a9bce 89502 89777 Author: Peter Hutterer <peter.hutterer@who-t.net> 89503 89778 Date: Thu Mar 22 11:34:43 2012 +1000 89504 89779 ··· 90130 90405 Signed-off-by: Dave Airlie <airlied@redhat.com> 90131 90406 90132 90407 commit 71594746c7da32e1c7986341a0da30f241a7a2be 90133 90133 - Merge: d53235af85 eaba06a27c 90408 90408 + Merge: d53235af8 eaba06a27 90134 90409 Author: Keith Packard <keithp@keithp.com> 90135 90410 Date: Wed Feb 22 18:07:20 2012 +1300 90136 90411 ··· 90375 90650 Signed-off-by: Keith Packard <keithp@keithp.com> 90376 90651 90377 90652 commit 42b6756463ee0476340656707f1088dc6c2fd220 90378 90378 - Merge: 7674d00b04 ca64912c02 90653 90653 + Merge: 7674d00b0 ca64912c0 90379 90654 Author: Keith Packard <keithp@keithp.com> 90380 90655 Date: Sat Feb 11 15:36:43 2012 +1300 90381 90656 ··· 91154 91429 ABI change pended for 1.13 91155 91430 91156 91431 commit e722ad6c3efa57b806ca0f2dc13114bd3619a88c 91157 91157 - Merge: e476af417d 4e44580efd 91432 91432 + Merge: e476af417 4e44580ef 91158 91433 Author: Keith Packard <keithp@keithp.com> 91159 91434 Date: Mon Jan 9 13:22:28 2012 -0800 91160 91435 91161 91436 Merge remote-tracking branch 'jturney/rpavlik-xwin-fixes' 91162 91437 91163 91438 commit e476af417d83730b11054f4e5b127ab5540bb332 91164 91164 - Merge: f4956faab9 146008358e 91439 91439 + Merge: f4956faab 146008358 91165 91440 Author: Keith Packard <keithp@keithp.com> 91166 91441 Date: Mon Jan 9 13:17:37 2012 -0800 91167 91442 ··· 91296 91571 Signed-off-by: Keith Packard <keithp@keithp.com> 91297 91572 91298 91573 commit 0b113f7cdf5228dccd51a749a339c8669e3f20ff 91299 91299 - Merge: 0b2c6491c5 777bf90abe 91574 91574 + Merge: 0b2c6491c 777bf90ab 91300 91575 Author: Keith Packard <keithp@keithp.com> 91301 91576 Date: Mon Jan 9 13:07:25 2012 -0800 91302 91577 91303 91578 Merge commit '777bf90abeac37087a3d0538b847742523d5acf2' 91304 91579 91305 91580 commit 0b2c6491c5e5e1c9ba067299f3de61f5acee263b 91306 91306 - Merge: 1f5587e144 6b19436536 91581 91581 + Merge: 1f5587e14 6b1943653 91307 91582 Author: Keith Packard <keithp@keithp.com> 91308 91583 Date: Mon Jan 9 11:40:23 2012 -0800 91309 91584 91310 91585 Merge remote-tracking branch 'whot/for-keith' 91311 91586 91312 91587 commit 1f5587e14406c083687203030db6a11691ac9d9f 91313 91313 - Merge: a97252db24 6269977c91 91588 91588 + Merge: a97252db2 6269977c9 91314 91589 Author: Keith Packard <keithp@keithp.com> 91315 91590 Date: Mon Jan 9 11:37:59 2012 -0800 91316 91591 ··· 91815 92090 Signed-off-by: Keith Packard <keithp@keithp.com> 91816 92091 91817 92092 commit 8dedf9831bd80514d800f0085213296a3726dba7 91818 91818 - Merge: cfc4c3d7fa cf96183122 92093 92093 + Merge: cfc4c3d7f cf9618312 91819 92094 Author: Keith Packard <keithp@keithp.com> 91820 92095 Date: Tue Dec 27 13:13:48 2011 -0800 91821 92096 ··· 91914 92189 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> 91915 92190 91916 92191 commit e395efc25f9fd60377f32c2bf1a9153d70908236 91917 91917 - Merge: 2bb282cd45 fcda98c486 92192 92192 + Merge: 2bb282cd4 fcda98c48 91918 92193 Author: Peter Hutterer <peter.hutterer@who-t.net> 91919 92194 Date: Thu Dec 22 09:29:59 2011 +1000 91920 92195 ··· 92352 92627 Reviewed-by: Chase Douglas <chase.douglas@canonical.com> 92353 92628 92354 92629 commit 2d34b34ed7547b829979756ccfb2cff79368d0a4 92355 92355 - Merge: e4b4d83fad 1deede3c48 92630 92630 + Merge: e4b4d83fa 1deede3c4 92356 92631 Author: Keith Packard <keithp@keithp.com> 92357 92632 Date: Tue Dec 20 00:23:33 2011 -0800 92358 92633 92359 92634 Merge remote-tracking branch 'jeremyhu/master' 92360 92635 92361 92636 commit e4b4d83fad37bb737e25f7226dbcd15b892f9528 92362 92362 - Merge: 4df65d247b d26cb70272 92637 92637 + Merge: 4df65d247 d26cb7027 92363 92638 Author: Keith Packard <keithp@keithp.com> 92364 92639 Date: Mon Dec 19 22:36:31 2011 -0800 92365 92640 ··· 92873 93148 Signed-off-by: Keith Packard <keithp@keithp.com> 92874 93149 92875 93150 commit 7da7aa96a0acb895e1fe57a9d3f2d093479cf2a2 92876 92876 - Merge: b79de3f42f 7528a6b88e 93151 93151 + Merge: b79de3f42 7528a6b88 92877 93152 Author: Keith Packard <keithp@keithp.com> 92878 93153 Date: Wed Dec 14 11:40:10 2011 -0800 92879 93154 ··· 92891 93166 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 92892 93167 92893 93168 commit 7528a6b88eb32098af4369a8bd9d70a808fa6f1c 92894 92894 - Merge: f0de5e3990 898d976729 93169 93169 + Merge: f0de5e399 898d97672 92895 93170 Author: Peter Hutterer <peter.hutterer@who-t.net> 92896 93171 Date: Tue Dec 13 14:19:54 2011 +1000 92897 93172 ··· 93771 94046 Signed-off-by: Keith Packard <keithp@keithp.com> 93772 94047 93773 94048 commit 522f8bcc0360d6a117e929a004bc956ab92037e9 93774 93774 - Merge: 6369b59668 2abe83df68 94049 94049 + Merge: 6369b5966 2abe83df6 93775 94050 Author: Keith Packard <keithp@keithp.com> 93776 94051 Date: Thu Dec 8 20:57:26 2011 -0800 93777 94052 ··· 93972 94247 Signed-off-by: Keith Packard <keithp@keithp.com> 93973 94248 93974 94249 commit 3ab8ee32470f7cf1223e04238bb8c5f74ed52fc3 93975 93975 - Merge: 22a666f995 98c4a888a4 94250 94250 + Merge: 22a666f99 98c4a888a 93976 94251 Author: Keith Packard <keithp@keithp.com> 93977 94252 Date: Wed Dec 7 12:42:17 2011 -0800 93978 94253 93979 94254 Merge remote-tracking branch 'airlied/reviewed-fixes' 93980 94255 93981 94256 commit 22a666f9952feb7248e9bb2faf777edaaac8175f 93982 93982 - Merge: 3824f558cc e89b0324da 94257 94257 + Merge: 3824f558c e89b0324d 93983 94258 Author: Keith Packard <keithp@keithp.com> 93984 94259 Date: Wed Dec 7 12:27:23 2011 -0800 93985 94260 ··· 94393 94668 Reviewed-by: Jamey Sharp <jamey@minilop.net> 94394 94669 94395 94670 commit 05f09354a30a4f5edd421220e1aa97be754c71bb 94396 94396 - Merge: 3197b773c8 08ec4da6a7 94671 94671 + Merge: 3197b773c 08ec4da6a 94397 94672 Author: Keith Packard <keithp@keithp.com> 94398 94673 Date: Thu Dec 1 14:44:52 2011 +0000 94399 94674 94400 94675 Merge remote-tracking branch 'jcristau/for-keith' 94401 94676 94402 94677 commit 3197b773c81e58cd4aa412eccaee49526012ed6f 94403 94403 - Merge: 2dc5ba4a1b dfcec1d3f9 94678 94678 + Merge: 2dc5ba4a1 dfcec1d3f 94404 94679 Author: Keith Packard <keithp@keithp.com> 94405 94680 Date: Thu Dec 1 14:36:58 2011 +0000 94406 94681 ··· 95276 95551 Signed-off-by: Keith Packard <keithp@keithp.com> 95277 95552 95278 95553 commit bfa2a1857a1efda7f171f10e855d200ca0dbcc1a 95279 95279 - Merge: f0d50cc665 e7cb8f802a 95554 95554 + Merge: f0d50cc66 e7cb8f802 95280 95555 Author: Keith Packard <keithp@keithp.com> 95281 95556 Date: Mon Nov 14 09:07:06 2011 -0800 95282 95557 ··· 95439 95714 Not needed in here 95440 95715 95441 95716 commit 548c6fe044068ffba9b5306dc6b11f2ba22782a4 95442 95442 - Merge: 3881b0bf1c ffe8ec86db 95717 95717 + Merge: 3881b0bf1 ffe8ec86d 95443 95718 Author: Keith Packard <keithp@keithp.com> 95444 95719 Date: Wed Nov 2 21:35:31 2011 -0700 95445 95720 ··· 95458 95733 Signed-off-by: Keith Packard <keithp@keithp.com> 95459 95734 95460 95735 commit d91aa0e6601bdf3e2cfa57b3412ab14ac486edc4 95461 95461 - Merge: 8df3a9ca5a 401150d7dc 95736 95736 + Merge: 8df3a9ca5 401150d7d 95462 95737 Author: Keith Packard <keithp@keithp.com> 95463 95738 Date: Wed Nov 2 21:20:07 2011 -0700 95464 95739 95465 95740 Merge remote-tracking branch 'whot/two-screen-coordinates' 95466 95741 95467 95742 commit 8df3a9ca5abbd56eb2013fa65250d21a8f18865b 95468 95468 - Merge: 8329afa59d ef895484c8 95743 95743 + Merge: 8329afa59 ef895484c 95469 95744 Author: Keith Packard <keithp@keithp.com> 95470 95745 Date: Wed Nov 2 21:18:16 2011 -0700 95471 95746 ··· 95620 95895 Signed-off-by: Keith Packard <keithp@keithp.com> 95621 95896 95622 95897 commit 132545ff576cc69ed63f5a08127151fe550de4c3 95623 95623 - Merge: d0c6732a99 d7c44a7c97 95898 95898 + Merge: d0c6732a9 d7c44a7c9 95624 95899 Author: Keith Packard <keithp@keithp.com> 95625 95900 Date: Sun Oct 30 16:57:58 2011 -0700 95626 95901 ··· 95846 96121 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 95847 96122 95848 96123 commit 5701ab4a441eb113abd0851b0d71b82d12112854 95849 95849 - Merge: 7d50211ab5 a41214bc9a 96124 96124 + Merge: 7d50211ab a41214bc9 95850 96125 Author: Keith Packard <keithp@keithp.com> 95851 96126 Date: Mon Oct 24 22:09:00 2011 -0700 95852 96127 ··· 96071 96346 Signed-off-by: Keith Packard <keithp@keithp.com> 96072 96347 96073 96348 commit d9d3a01ffca5e2de650d098231e16205781804c5 96074 96074 - Merge: 17416e88dc fb55f8f790 96349 96349 + Merge: 17416e88d fb55f8f79 96075 96350 Author: Keith Packard <keithp@keithp.com> 96076 96351 Date: Mon Oct 24 18:12:23 2011 -0700 96077 96352 ··· 96248 96523 Reviewed-by: Julien Cristau <jcristau@debian.org> 96249 96524 96250 96525 commit ff61592441916b83aeb778c74352bb5b26247f84 96251 96251 - Merge: af3f64fb77 525d4172b2 96526 96526 + Merge: af3f64fb7 525d4172b 96252 96527 Author: Keith Packard <keithp@keithp.com> 96253 96528 Date: Wed Oct 19 19:14:32 2011 -0700 96254 96529 96255 96530 Merge remote-tracking branch 'aplattner/for-master' 96256 96531 96257 96532 commit af3f64fb77c13180e513ee99d1fd9a1b624fd8ea 96258 96258 - Merge: 15bbdc103b df0dd36dee 96533 96533 + Merge: 15bbdc103 df0dd36de 96259 96534 Author: Keith Packard <keithp@keithp.com> 96260 96535 Date: Wed Oct 19 17:33:07 2011 -0700 96261 96536 96262 96537 Merge remote-tracking branch 'hramrach/pull' 96263 96538 96264 96539 commit 15bbdc103b34b6b374815698946e6c409421a644 96265 96265 - Merge: a5266dcb3a 323869f329 96540 96540 + Merge: a5266dcb3 323869f32 96266 96541 Author: Keith Packard <keithp@keithp.com> 96267 96542 Date: Wed Oct 19 17:26:50 2011 -0700 96268 96543 ··· 96369 96644 Signed-off-by: Aaron Plattner <aplattner@nvidia.com> 96370 96645 96371 96646 commit c8413362049cee8c30e0a9d67f78f9ebefe8e71f 96372 96372 - Merge: 64d2d1bef1 b67581cf82 96647 96647 + Merge: 64d2d1bef b67581cf8 96373 96648 Author: Keith Packard <keithp@keithp.com> 96374 96649 Date: Tue Oct 18 07:45:24 2011 -0700 96375 96650 ··· 96516 96791 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 96517 96792 96518 96793 commit 64d2d1bef14c7ec7156bb3aae64eff69f9f7be54 96519 96519 - Merge: fb84be47db 679c84bce9 96794 96794 + Merge: fb84be47d 679c84bce 96520 96795 Author: Keith Packard <keithp@keithp.com> 96521 96796 Date: Mon Oct 17 14:36:34 2011 -0700 96522 96797 96523 96798 Merge remote-tracking branch 'jeremyhu/master' 96524 96799 96525 96800 commit fb84be47db7cdaff406792c08e34670e8e0cbda9 96526 96526 - Merge: fae7ed62ad 32b289e46c 96801 96801 + Merge: fae7ed62a 32b289e46 96527 96802 Author: Keith Packard <keithp@keithp.com> 96528 96803 Date: Mon Oct 17 13:50:25 2011 -0700 96529 96804 ··· 97285 97560 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 97286 97561 97287 97562 commit 6378d0233d21088b6429755627b4253859892c72 97288 97288 - Merge: 6e965d8a18 98b230669f 97563 97563 + Merge: 6e965d8a1 98b230669 97289 97564 Author: Keith Packard <keithp@keithp.com> 97290 97565 Date: Mon Oct 3 13:56:06 2011 -0700 97291 97566 97292 97567 Merge remote-tracking branch 'herrb/master' 97293 97568 97294 97569 commit 6e965d8a185087a55b2100b817e18f05b3ce5a00 97295 97295 - Merge: 466e4b3f17 ac5881d6d0 97570 97570 + Merge: 466e4b3f1 ac5881d6d 97296 97571 Author: Keith Packard <keithp@keithp.com> 97297 97572 Date: Mon Oct 3 13:47:49 2011 -0700 97298 97573 ··· 97428 97703 Signed-off-by: Keith Packard <keithp@keithp.com> 97429 97704 97430 97705 commit 9a55b3661b4172f9a32cd6fefb254e06edb1a88a 97431 97431 - Merge: cf11ca360c 84bb0207f6 97706 97706 + Merge: cf11ca360 84bb0207f 97432 97707 Author: Keith Packard <keithp@keithp.com> 97433 97708 Date: Mon Oct 3 11:49:23 2011 -0700 97434 97709 97435 97710 Merge remote-tracking branch 'alanc/master' 97436 97711 97437 97712 commit cf11ca360c2ded5ca309faa9d039160947387bb8 97438 97438 - Merge: 463dd87062 6eae9fa284 97713 97713 + Merge: 463dd8706 6eae9fa28 97439 97714 Author: Keith Packard <keithp@keithp.com> 97440 97715 Date: Mon Oct 3 11:44:59 2011 -0700 97441 97716 ··· 97458 97733 Signed-off-by: Keith Packard <keithp@keithp.com> 97459 97734 97460 97735 commit f5d50b46ddeb039ab6564141f61261e94ee67637 97461 97461 - Merge: 57cd32e934 524e5445c0 97736 97736 + Merge: 57cd32e93 524e5445c 97462 97737 Author: Keith Packard <keithp@keithp.com> 97463 97738 Date: Mon Oct 3 11:36:28 2011 -0700 97464 97739 ··· 97594 97869 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 97595 97870 97596 97871 commit 4c6bc0e76599dbe5ede2e1f48c9936a0e996b638 97597 97597 - Merge: 057cc92ebf 3304bbff9b 97872 97872 + Merge: 057cc92eb 3304bbff9 97598 97873 Author: Peter Hutterer <peter.hutterer@who-t.net> 97599 97874 Date: Fri Sep 30 09:24:56 2011 +1000 97600 97875 ··· 97803 98078 server recycling. 97804 98079 97805 98080 commit 057cc92ebfeebe81b7d01ff2c6aa2c066c8d1a64 97806 97806 - Merge: afb1fe695d 52c9b59a9f 98081 98081 + Merge: afb1fe695 52c9b59a9 97807 98082 Author: Peter Hutterer <peter.hutterer@who-t.net> 97808 98083 Date: Thu Sep 29 14:18:35 2011 +1000 97809 98084 ··· 98318 98593 Reviewed-by: Aaron Plattner <aplattner@nvidia.com> 98319 98594 98320 98595 commit afb1fe695d197187a301c19863a128a65389b15c 98321 98321 - Merge: 7fb4bef039 c7163fdd30 98596 98596 + Merge: 7fb4bef03 c7163fdd3 98322 98597 Author: Keith Packard <keithp@keithp.com> 98323 98598 Date: Mon Sep 26 20:24:15 2011 -0700 98324 98599 ··· 100637 100912 Reviewed-by: Matt Dew <marcoz@osource.org> 100638 100913 100639 100914 commit 7fb4bef0394a5d09680985d34bce8252b61493cb 100640 100640 - Merge: 98f4940093 c90903b4f7 100915 100915 + Merge: 98f494009 c90903b4f 100641 100916 Author: Keith Packard <keithp@keithp.com> 100642 100917 Date: Wed Sep 21 14:34:27 2011 -0700 100643 100918 100644 100919 Merge remote-tracking branch 'mattst88/for-keith' 100645 100920 100646 100921 commit 98f4940093dc90c3366d3e4d3ddceacbaee299dc 100647 100647 - Merge: b018b81533 c8eacae4f8 100922 100922 + Merge: b018b8153 c8eacae4f 100648 100923 Author: Keith Packard <keithp@keithp.com> 100649 100924 Date: Wed Sep 21 14:30:19 2011 -0700 100650 100925 100651 100926 Merge remote-tracking branch 'alanc/master' 100652 100927 100653 100928 commit b018b815333b256b5e06dd6251b2e539f09f89fa 100654 100654 - Merge: 03d032991d 0f380a5005 100929 100929 + Merge: 03d032991 0f380a500 100655 100930 Author: Keith Packard <keithp@keithp.com> 100656 100931 Date: Wed Sep 21 14:17:14 2011 -0700 100657 100932 ··· 100981 101256 Signed-off-by: Keith Packard <keithp@keithp.com> 100982 101257 100983 101258 commit c92c83523ede8bc361526ac93d09d089fbbdae08 100984 100984 - Merge: 4ad271d06c 24b2b43e85 101259 101259 + Merge: 4ad271d06 24b2b43e8 100985 101260 Author: Keith Packard <keithp@keithp.com> 100986 101261 Date: Wed Sep 21 13:32:06 2011 -0700 100987 101262 ··· 102031 102306 Signed-off-by: Keith Packard <keithp@keithp.com> 102032 102307 102033 102308 commit b8f61c11c94708d4f17720a55945dee4621315a4 102034 102034 - Merge: 5596f10cce f51e42f583 102309 102309 + Merge: 5596f10cc f51e42f58 102035 102310 Author: Keith Packard <keithp@keithp.com> 102036 102311 Date: Fri Jul 29 14:58:58 2011 -0700 102037 102312 ··· 102347 102622 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 102348 102623 102349 102624 commit 01dbf2514aa0cc8c40a876a24e3cb0737c41da19 102350 102350 - Merge: 5a801af689 af0fbc37e3 102625 102625 + Merge: 5a801af68 af0fbc37e 102351 102626 Author: Keith Packard <keithp@keithp.com> 102352 102627 Date: Wed Jul 13 11:44:15 2011 -0700 102353 102628 ··· 102513 102788 Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> 102514 102789 102515 102790 commit d4096abb591353405417e53816e5c46e904e7b25 102516 102516 - Merge: 61f87a75f2 87d4f90bfc 102791 102791 + Merge: 61f87a75f 87d4f90bf 102517 102792 Author: Keith Packard <keithp@keithp.com> 102518 102793 Date: Fri Jul 1 15:45:45 2011 -0700 102519 102794 ··· 102751 103026 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 102752 103027 102753 103028 commit 61f87a75f2bcda939a1778d39be8cfa5c886e6d8 102754 102754 - Merge: 0d2153a46c 72d914335c 103029 103029 + Merge: 0d2153a46 72d914335 102755 103030 Author: Keith Packard <keithp@keithp.com> 102756 103031 Date: Wed Jun 29 20:14:51 2011 -0700 102757 103032 102758 103033 Merge remote-tracking branch 'jturney/master' 102759 103034 102760 103035 commit 0d2153a46cc72d5f2e6a9081a3cf153aa3eb7787 102761 102761 - Merge: b631c39a21 932513e23b 103036 103036 + Merge: b631c39a2 932513e23 102762 103037 Author: Keith Packard <keithp@keithp.com> 102763 103038 Date: Wed Jun 29 20:08:32 2011 -0700 102764 103039 ··· 102779 103054 Signed-off-by: Keith Packard <keithp@keithp.com> 102780 103055 102781 103056 commit d5ca33ca2dd08e8436439da926d2dedaabc268fa 102782 102782 - Merge: 38d55f06cf 4edf49d032 103057 103057 + Merge: 38d55f06c 4edf49d03 102783 103058 Author: Keith Packard <keithp@keithp.com> 102784 103059 Date: Wed Jun 29 18:54:33 2011 -0700 102785 103060 ··· 102942 103217 after 'make clean' causing 'make distcheck' to fail. 102943 103218 102944 103219 commit f968f4ace9410d827fb6b68c4e38ea9516641309 102945 102945 - Merge: 4dbed26254 163441fe53 103220 103220 + Merge: 4dbed2625 163441fe5 102946 103221 Author: Keith Packard <keithp@keithp.com> 102947 103222 Date: Tue Jun 28 09:10:14 2011 -0700 102948 103223 ··· 103017 103292 Tested-by: Peter Hutterer <peter.hutterer@who-t.net> 103018 103293 103019 103294 commit 8ac651552bb70ba36238f430adab2f7a7f24db6e 103020 103020 - Merge: 945b2ff814 47b6ba3204 103295 103295 + Merge: 945b2ff81 47b6ba320 103021 103296 Author: Keith Packard <keithp@keithp.com> 103022 103297 Date: Wed Jun 22 11:03:37 2011 -0700 103023 103298 ··· 103592 103867 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 103593 103868 103594 103869 commit 02d11af01211da55e9d93fe0e1851a0c6fe57472 103595 103595 - Merge: bf9fd0a83e ab0df72cd3 103870 103870 + Merge: bf9fd0a83 ab0df72cd 103596 103871 Author: Keith Packard <keithp@keithp.com> 103597 103872 Date: Tue Jun 7 12:31:15 2011 -0700 103598 103873 103599 103874 Merge remote-tracking branch 'kibi/master' 103600 103875 103601 103876 commit bf9fd0a83eef771ee018438f05e2d9f20b43539b 103602 103602 - Merge: 21eec367d0 0d140567ba 103877 103877 + Merge: 21eec367d 0d140567b 103603 103878 Author: Keith Packard <keithp@keithp.com> 103604 103879 Date: Tue Jun 7 07:45:22 2011 -0700 103605 103880 ··· 103949 104224 Signed-off-by: Keith Packard <keithp@keithp.com> 103950 104225 103951 104226 commit 0643c056512d10be8db223d18d6563292d57e916 103952 103952 - Merge: a2e6cfc18a d45f5b2493 104227 104227 + Merge: a2e6cfc18 d45f5b249 103953 104228 Author: Keith Packard <keithp@keithp.com> 103954 104229 Date: Tue May 31 23:45:07 2011 -0700 103955 104230 103956 104231 Merge remote-tracking branch 'ajax/xserver-next' 103957 104232 103958 104233 commit a2e6cfc18aec1c0027b51572b03ec9f2ab074b56 103959 103959 - Merge: bc04065b5c 8d84fd2566 104234 104234 + Merge: bc04065b5 8d84fd256 103960 104235 Author: Keith Packard <keithp@keithp.com> 103961 104236 Date: Tue May 31 23:42:52 2011 -0700 103962 104237 ··· 104092 104367 Signed-off-by: Keith Packard <keithp@keithp.com> 104093 104368 104094 104369 commit 4725d6b0dbb6371af4a1b2fbef851dcfe155514a 104095 104095 - Merge: 1b2d17748f b5d828789c 104370 104370 + Merge: 1b2d17748 b5d828789 104096 104371 Author: Keith Packard <keithp@keithp.com> 104097 104372 Date: Wed May 25 09:40:51 2011 -0600 104098 104373 ··· 104534 104809 Signed-off-by: Keith Packard <keithp@keithp.com> 104535 104810 104536 104811 commit ba5540221f2a46133371b4ff0d527b1a0a1443b1 104537 104537 - Merge: 6347a0b802 728d0bf20e 104812 104812 + Merge: 6347a0b80 728d0bf20 104538 104813 Author: Keith Packard <keithp@keithp.com> 104539 104814 Date: Fri May 13 13:59:36 2011 -0700 104540 104815 104541 104816 Merge remote-tracking branch 'whot/for-keith' 104542 104817 104543 104818 commit 6347a0b802812bb185ada1bf0951add306935184 104544 104544 - Merge: 4d02c53971 f144fb771f 104819 104819 + Merge: 4d02c5397 f144fb771 104545 104820 Author: Keith Packard <keithp@keithp.com> 104546 104821 Date: Fri May 13 13:54:29 2011 -0700 104547 104822 104548 104823 Merge remote-tracking branch 'jeremyhu/master' 104549 104824 104550 104825 commit 4d02c5397114ac4d15e794908f0708427e258261 104551 104551 - Merge: 043c175865 eac37f32b8 104826 104826 + Merge: 043c17586 eac37f32b 104552 104827 Author: Keith Packard <keithp@keithp.com> 104553 104828 Date: Fri May 13 13:52:18 2011 -0700 104554 104829 ··· 105250 105525 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 105251 105526 105252 105527 commit 5cb31cd0cbf83fff5f17a475e7b0e45246b19bf3 105253 105253 - Merge: 0f284f0f42 4d8735d388 105528 105528 + Merge: 0f284f0f4 4d8735d38 105254 105529 Author: Keith Packard <keithp@keithp.com> 105255 105530 Date: Fri Apr 29 09:59:49 2011 -0700 105256 105531 ··· 105305 105580 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 105306 105581 105307 105582 commit f6d4e75ec55ac6812f9dead42ecdffb9614578c7 105308 105308 - Merge: ec9ea40178 4318e6a147 105583 105583 + Merge: ec9ea4017 4318e6a14 105309 105584 Author: Keith Packard <keithp@keithp.com> 105310 105585 Date: Wed Apr 27 12:08:51 2011 -0700 105311 105586 105312 105587 Merge remote-tracking branch 'jturney/master' 105313 105588 105314 105589 commit ec9ea4017885cefe5519a4e890b0ff1a5518235a 105315 105315 - Merge: c6cb70be1e 6f29dbf5e3 105590 105590 + Merge: c6cb70be1 6f29dbf5e 105316 105591 Author: Keith Packard <keithp@keithp.com> 105317 105592 Date: Wed Apr 27 12:01:56 2011 -0700 105318 105593 ··· 106026 106301 Signed-off-by: Søren Sandmann <ssp@redhat.com> 106027 106302 106028 106303 commit 918a9c99cf2ebc73acb34b95f597904b93c690d9 106029 106029 - Merge: 88c4622b59 5f496bc919 106304 106304 + Merge: 88c4622b5 5f496bc91 106030 106305 Author: Keith Packard <keithp@keithp.com> 106031 106306 Date: Fri Apr 22 11:20:16 2011 -0700 106032 106307 ··· 106056 106331 Signed-off-by: Keith Packard <keithp@keithp.com> 106057 106332 106058 106333 commit 302bdc3c9678c028bed71dbe9c5ba04997626b6b 106059 106059 - Merge: 001b6b8b70 6f97fe5df1 106334 106334 + Merge: 001b6b8b7 6f97fe5df 106060 106335 Author: Keith Packard <keithp@keithp.com> 106061 106336 Date: Fri Apr 22 10:48:37 2011 -0700 106062 106337 ··· 106786 107061 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 106787 107062 106788 107063 commit 3085b178626c957854385c7a88a05ec3c7eb74f3 106789 106789 - Merge: c9d89cec14 3c45b59e67 107064 107064 + Merge: c9d89cec1 3c45b59e6 106790 107065 Author: Keith Packard <keithp@keithp.com> 106791 107066 Date: Wed Apr 6 08:34:10 2011 -0700 106792 107067 106793 107068 Merge remote-tracking branch 'jturney/master' 106794 107069 106795 107070 commit c9d89cec1407550cb2568f4cef146c93607bbae6 106796 106796 - Merge: a52049de2f bc61787a20 107071 107071 + Merge: a52049de2 bc61787a2 106797 107072 Author: Keith Packard <keithp@keithp.com> 106798 107073 Date: Mon Apr 4 11:57:39 2011 -0700 106799 107074 ··· 107040 107315 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 107041 107316 107042 107317 commit a52049de2f846fe984d4db5ac8d2c1826c7b2d0b 107043 107043 - Merge: d044d36756 266ea63bc3 107318 107318 + Merge: d044d3675 266ea63bc 107044 107319 Author: Peter Hutterer <peter.hutterer@who-t.net> 107045 107320 Date: Mon Apr 4 09:58:53 2011 +1000 107046 107321 ··· 107216 107491 Reviewed-by: Keith Packard <keithp@keithp.com> 107217 107492 107218 107493 commit e0a2ad51dfb7373aa602335490d9666d6101b5ea 107219 107219 - Merge: 327e1d8801 3d688316af 107494 107494 + Merge: 327e1d880 3d688316a 107220 107495 Author: Keith Packard <keithp@keithp.com> 107221 107496 Date: Wed Mar 30 10:51:27 2011 -0700 107222 107497 ··· 107445 107720 Signed-off-by: Keith Packard <keithp@keithp.com> 107446 107721 107447 107722 commit a095a6d4e8f5090907e8d3d66018636216300846 107448 107448 - Merge: a22486f848 ef9d04f8ad 107723 107723 + Merge: a22486f84 ef9d04f8a 107449 107724 Author: Keith Packard <keithp@keithp.com> 107450 107725 Date: Sun Mar 27 20:06:29 2011 -0700 107451 107726 107452 107727 Merge remote-tracking branch 'airlied/pwin-cleanup' 107453 107728 107454 107729 commit a22486f848014000dc13dda470f77d4d8ea9e9f6 107455 107455 - Merge: 2ef4ff45ef 633b81e8ba 107730 107730 + Merge: 2ef4ff45e 633b81e8b 107456 107731 Author: Keith Packard <keithp@keithp.com> 107457 107732 Date: Sun Mar 27 18:27:10 2011 -0700 107458 107733 ··· 107660 107935 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> 107661 107936 107662 107937 commit 03f45df93469f6aef391e97007b9614e0770cc4c 107663 107663 - Merge: efcb7275ce 5fb329a04a 107938 107938 + Merge: efcb7275c 5fb329a04 107664 107939 Author: Keith Packard <keithp@keithp.com> 107665 107940 Date: Wed Mar 23 13:38:37 2011 +0900 107666 107941 ··· 107849 108124 Signed-off-by: Keith Packard <keithp@keithp.com> 107850 108125 107851 108126 commit 0ac4931753a5d5925fc844c8cbec08585aea57a7 107852 107852 - Merge: a8146f6bec d7f8011418 108127 108127 + Merge: a8146f6be d7f801141 107853 108128 Author: Keith Packard <keithp@keithp.com> 107854 108129 Date: Mon Mar 14 13:06:41 2011 -0700 107855 108130 ··· 108169 108444 Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> 108170 108445 108171 108446 commit c3c0e2fdd326214e271ce144e8fc2725cbd738ef 108172 108172 - Merge: a19771e433 73555555a4 108447 108447 + Merge: a19771e43 73555555a 108173 108448 Author: Keith Packard <keithp@keithp.com> 108174 108449 Date: Wed Mar 9 14:25:54 2011 -0800 108175 108450 ··· 108538 108813 Signed-off-by: Keith Packard <keithp@keithp.com> 108539 108814 108540 108815 commit 6c90e839d9872a37d371578c9c423e8213922044 108541 108541 - Merge: 0bc95d5b06 edcceedbd3 108816 108816 + Merge: 0bc95d5b0 edcceedbd 108542 108817 Author: Keith Packard <keithp@keithp.com> 108543 108818 Date: Thu Mar 3 14:41:44 2011 -0800 108544 108819 108545 108820 Merge remote branch 'whot/for-keith' 108546 108821 108547 108822 commit 0bc95d5b06dcea65a1aa193ea907b50f7dd168b5 108548 108548 - Merge: 3f41f4adea 69a9171dbb 108823 108823 + Merge: 3f41f4ade 69a9171db 108549 108824 Author: Keith Packard <keithp@keithp.com> 108550 108825 Date: Thu Mar 3 14:33:08 2011 -0800 108551 108826 108552 108827 Merge remote branch 'jeremyhu/master' 108553 108828 108554 108829 commit 3f41f4adea4bbb90d4bda4dab600595b655e3ed8 108555 108555 - Merge: 8e4c3ce55b dae24abcd4 108830 108830 + Merge: 8e4c3ce55 dae24abcd 108556 108831 Author: Keith Packard <keithp@keithp.com> 108557 108832 Date: Thu Mar 3 14:12:36 2011 -0800 108558 108833 108559 108834 Merge remote branch 'sandmann/for-keithp' 108560 108835 108561 108836 commit 8e4c3ce55b0f186bc6ba4039e30629669b6087b7 108562 108562 - Merge: f3d19c0cf3 296561506a 108837 108837 + Merge: f3d19c0cf 296561506 108563 108838 Author: Keith Packard <keithp@keithp.com> 108564 108839 Date: Thu Mar 3 13:42:07 2011 -0800 108565 108840 ··· 108633 108908 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 108634 108909 108635 108910 commit c2207d11f243900bc2f641e08d80da63d84e97a8 108636 108636 - Merge: 00779932de 579ee8f5d8 108911 108911 + Merge: 00779932d 579ee8f5d 108637 108912 Author: Peter Hutterer <peter.hutterer@who-t.net> 108638 108913 Date: Mon Feb 28 11:26:09 2011 +1000 108639 108914 ··· 108888 109163 Reviewed-by: Fernando Carrijo <fcarrijo@freedesktop.org> 108889 109164 108890 109165 commit 229b055bdbc53370944401649234e8a38183f4fb 108891 108891 - Merge: 6178959e3d b17fc99cb9 109166 109166 + Merge: 6178959e3 b17fc99cb 108892 109167 Author: Keith Packard <keithp@keithp.com> 108893 109168 Date: Thu Feb 24 19:44:35 2011 -0800 108894 109169 ··· 108942 109217 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 108943 109218 108944 109219 commit 83861595782aaa05907f9cf7b236d50261d404d9 108945 108945 - Merge: a1cc0e52b0 4102a00962 109220 109220 + Merge: a1cc0e52b 4102a0096 108946 109221 Author: Keith Packard <keithp@keithp.com> 108947 109222 Date: Thu Feb 24 18:59:07 2011 -0800 108948 109223 ··· 108962 109237 Signed-off-by: Keith Packard <keithp@keithp.com> 108963 109238 108964 109239 commit 365ad68fb9f7029550505b7c276a808050cada9c 108965 108965 - Merge: 0801afbd7c 720c895db9 109240 109240 + Merge: 0801afbd7 720c895db 108966 109241 Author: Keith Packard <keithp@keithp.com> 108967 109242 Date: Thu Feb 24 18:49:40 2011 -0800 108968 109243 ··· 109296 109571 Signed-off-by: Cyril Brulebois <kibi@debian.org> 109297 109572 109298 109573 commit 579ee8f5d84c3a523b7b3e3941eabb226d1d19e2 109299 109299 - Merge: b636893137 17265ccb02 109574 109574 + Merge: b63689313 17265ccb0 109300 109575 Author: Peter Hutterer <peter.hutterer@who-t.net> 109301 109576 Date: Wed Feb 23 08:44:42 2011 +1000 109302 109577 ··· 109602 109877 Signed-off-by: Keith Packard <keithp@keithp.com> 109603 109878 109604 109879 commit 2c77aeb39f59f1a94cc603a2e6256a62ce785c36 109605 109605 - Merge: 816d67de2b 402b329c3a 109880 109880 + Merge: 816d67de2 402b329c3 109606 109881 Author: Keith Packard <keithp@keithp.com> 109607 109882 Date: Fri Feb 18 14:29:32 2011 -0800 109608 109883 109609 109884 Merge remote branch 'jcristau/for-keith' 109610 109885 109611 109886 commit 816d67de2ba9bdfe652da32cb6447a3056342b98 109612 109612 - Merge: a73c28f0bd 3bbb70a1a7 109887 109887 + Merge: a73c28f0b 3bbb70a1a 109613 109888 Author: Keith Packard <keithp@keithp.com> 109614 109889 Date: Fri Feb 18 12:20:26 2011 -0800 109615 109890 ··· 109629 109904 Signed-off-by: Keith Packard <keithp@keithp.com> 109630 109905 109631 109906 commit 0bc9b15a622377c57e617411ccd26c4b5bf8cba4 109632 109632 - Merge: d1123b66eb 93cd4b1034 109907 109907 + Merge: d1123b66e 93cd4b103 109633 109908 Author: Keith Packard <keithp@keithp.com> 109634 109909 Date: Fri Feb 18 12:04:41 2011 -0800 109635 109910 109636 109911 Merge remote branch 'ajax/for-keithp' 109637 109912 109638 109913 commit d1123b66ebbcf96dd816236f54befc568a5f7c68 109639 109639 - Merge: 5d020c3135 f6e4ace9ea 109914 109914 + Merge: 5d020c313 f6e4ace9e 109640 109915 Author: Keith Packard <keithp@keithp.com> 109641 109916 Date: Fri Feb 18 11:59:25 2011 -0800 109642 109917 ··· 110351 110626 Reviewed-by: Ville Syrjälä <ville.syrjala@nokia.com> 110352 110627 110353 110628 commit ea1ffd3e60bdcedbec5a6f28929f8677bf45d450 110354 110354 - Merge: 12b0f7df2c 53602c3621 110629 110629 + Merge: 12b0f7df2 53602c362 110355 110630 Author: Keith Packard <keithp@keithp.com> 110356 110631 Date: Wed Feb 2 15:19:55 2011 -0800 110357 110632 ··· 110442 110717 Signed-off-by: Keith Packard <keithp@keithp.com> 110443 110718 110444 110719 commit 246d40b685292fa6393ba22127152137494af2af 110445 110445 - Merge: 70f2d39fbd 8c1f75a1d4 110720 110720 + Merge: 70f2d39fb 8c1f75a1d 110446 110721 Author: Keith Packard <keithp@keithp.com> 110447 110722 Date: Wed Feb 2 14:51:33 2011 -0800 110448 110723 110449 110724 Merge remote branch 'jeremyhu/master' 110450 110725 110451 110726 commit 70f2d39fbde38d0baa687f1755b6c4c686f23052 110452 110452 - Merge: 3a91c2d21c a9d3c43a57 110727 110727 + Merge: 3a91c2d21 a9d3c43a5 110453 110728 Author: Keith Packard <keithp@keithp.com> 110454 110729 Date: Wed Feb 2 14:43:19 2011 -0800 110455 110730 110456 110731 Merge remote branch 'jturney/master' 110457 110732 110458 110733 commit 3a91c2d21c3231e2a011d95c3cfc01785430c1cf 110459 110459 - Merge: ac0a00a840 82b1eaa6ca 110734 110734 + Merge: ac0a00a84 82b1eaa6c 110460 110735 Author: Keith Packard <keithp@keithp.com> 110461 110736 Date: Wed Feb 2 14:37:00 2011 -0800 110462 110737 ··· 110709 110984 Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com> 110710 110985 110711 110986 commit be3be7580b6f6fd2f7fa4d4abfe5e1ab19470223 110712 110712 - Merge: 57a1d9b853 a1d885fdd6 110987 110987 + Merge: 57a1d9b85 a1d885fdd 110713 110988 Author: Keith Packard <keithp@keithp.com> 110714 110989 Date: Thu Jan 20 21:21:21 2011 -0800 110715 110990 110716 110991 Merge remote branch 'ajax/for-keithp' 110717 110992 110718 110993 commit 57a1d9b85331f6fe19d5111f5163139572ffbf02 110719 110719 - Merge: 24ce650cf4 6423769799 110994 110994 + Merge: 24ce650cf 642376979 110720 110995 Author: Keith Packard <keithp@keithp.com> 110721 110996 Date: Thu Jan 20 21:16:24 2011 -0800 110722 110997 110723 110998 Merge remote branch 'whot/for-keith' 110724 110999 110725 111000 commit 24ce650cf4f0c6fa72faecd38c53d40703e6c959 110726 110726 - Merge: bbdf81a056 09fd010902 111001 111001 + Merge: bbdf81a05 09fd01090 110727 111002 Author: Keith Packard <keithp@keithp.com> 110728 111003 Date: Thu Jan 20 21:11:53 2011 -0800 110729 111004 ··· 111231 111506 Signed-off-by: Keith Packard <keithp@keithp.com> 111232 111507 111233 111508 commit abfea17342da774aa4e3a351a73c8f2af6e6fd28 111234 111234 - Merge: 361128389e e65c3f8bcc 111509 111509 + Merge: 361128389 e65c3f8bc 111235 111510 Author: Keith Packard <keithp@keithp.com> 111236 111511 Date: Tue Jan 18 15:19:34 2011 -0800 111237 111512 111238 111513 Merge remote branch 'ajax/for-keithp' 111239 111514 111240 111515 commit 361128389e5cb0101cbd091ff8de77cf34608f6c 111241 111241 - Merge: 65ceaadbf0 d9225b9602 111516 111516 + Merge: 65ceaadbf d9225b960 111242 111517 Author: Keith Packard <keithp@keithp.com> 111243 111518 Date: Tue Jan 18 15:18:08 2011 -0800 111244 111519 ··· 111576 111851 Acked-by: Gaetan Nadon <memsize@videotron.ca> 111577 111852 111578 111853 commit 8456625d64bb0013a496f3b56ea3aa20cf7a6142 111579 111579 - Merge: aa30a86583 ce74e7562d 111854 111854 + Merge: aa30a8658 ce74e7562 111580 111855 Author: Peter Hutterer <peter.hutterer@who-t.net> 111581 111856 Date: Fri Jan 7 09:35:07 2011 +1000 111582 111857 ··· 111921 112196 Signed-off-by: Keith Packard <keithp@keithp.com> 111922 112197 111923 112198 commit 0dede200c9ac7adbe8b8c16efacc3edc1f183cd9 111924 111924 - Merge: 7714357f50 2e781457d4 112199 112199 + Merge: 7714357f5 2e781457d 111925 112200 Author: Keith Packard <keithp@keithp.com> 111926 112201 Date: Wed Jan 5 08:51:46 2011 -0800 111927 112202 111928 112203 Merge remote branch 'vsyrjala/misc_fixes' 111929 112204 111930 112205 commit 7714357f506782973d25e270f85140b42507ed35 111931 111931 - Merge: 02e18c9fb5 b01dd9d336 112206 112206 + Merge: 02e18c9fb b01dd9d33 111932 112207 Author: Keith Packard <keithp@keithp.com> 111933 112208 Date: Wed Jan 5 08:43:18 2011 -0800 111934 112209 ··· 112621 112896 Signed-off-by: Adam Jackson <ajax@redhat.com> 112622 112897 112623 112898 commit e7dc253452a1ba64718a08fdc070405b494f53cd 112624 112624 - Merge: d1107918d4 d5b0d58573 112899 112899 + Merge: d1107918d d5b0d5857 112625 112900 Author: Keith Packard <keithp@keithp.com> 112626 112901 Date: Mon Dec 20 00:48:45 2010 -0800 112627 112902 ··· 112723 112998 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 112724 112999 112725 113000 commit f1542f1d716723cba7c323849086585635121893 112726 112726 - Merge: 9716d31247 8a8fdd762a 113001 113001 + Merge: 9716d3124 8a8fdd762 112727 113002 Author: Keith Packard <keithp@keithp.com> 112728 113003 Date: Tue Dec 14 15:04:12 2010 -0800 112729 113004 112730 113005 Merge remote branch 'whot/for-keith' 112731 113006 112732 113007 commit 9716d3124799c6db0d1c782aa72c72f972d5a158 112733 112733 - Merge: 03ea0b7726 f641e4b34a 113008 113008 + Merge: 03ea0b772 f641e4b34 112734 113009 Author: Keith Packard <keithp@keithp.com> 112735 113010 Date: Tue Dec 14 15:01:36 2010 -0800 112736 113011 ··· 112907 113182 Signed-off-by: Keith Packard <keithp@keithp.com> 112908 113183 112909 113184 commit 519d243f0c8e3c80226701f71d2cfa62e42dbff7 112910 112910 - Merge: 9f9c732311 446482efaa 113185 113185 + Merge: 9f9c73231 446482efa 112911 113186 Author: Keith Packard <keithp@keithp.com> 112912 113187 Date: Tue Dec 7 13:39:58 2010 -0800 112913 113188 ··· 113365 113640 Reviewed-by: Aaron Plattner <aplattner@nvidia.com> 113366 113641 113367 113642 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113368 113368 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113643 113643 + Merge: 01e9fa7da 8127c83c8 113369 113644 Author: Keith Packard <keithp@keithp.com> 113370 113645 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113371 113646 113372 113647 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113373 113648 113374 113649 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113375 113375 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113650 113650 + Merge: 79870dbf7 68a1b0de9 113376 113651 Author: Keith Packard <keithp@keithp.com> 113377 113652 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113378 113653 ··· 113395 113670 Signed-off-by: Keith Packard <keithp@keithp.com> 113396 113671 113397 113672 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113398 113398 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113673 113673 + Merge: 5de312a60 714b68d9e 113399 113674 Author: Keith Packard <keithp@keithp.com> 113400 113675 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113401 113676 113402 113677 Merge remote branch 'jeremyhu/master' 113403 113678 113404 113679 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113405 113405 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113680 113680 + Merge: 311cad331 8f42b2b69 113406 113681 Author: Keith Packard <keithp@keithp.com> 113407 113682 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113408 113683 ··· 113753 114028 Signed-off-by: Keith Packard <keithp@keithp.com> 113754 114029 113755 114030 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113756 113756 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114031 114031 + Merge: dab064fa5 f4f41c812 113757 114032 Author: Keith Packard <keithp@keithp.com> 113758 114033 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 113759 114034 ··· 114003 114278 Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> 114004 114279 114005 114280 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114006 114006 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114281 114281 + Merge: afd6eb66d b85f9063c 114007 114282 Author: Keith Packard <keithp@keithp.com> 114008 114283 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114009 114284 114010 114285 Merge remote branch 'ajax/for-keithp' 114011 114286 114012 114287 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114013 114013 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114288 114288 + Merge: b16964910 ffcbfa006 114014 114289 Author: Keith Packard <keithp@keithp.com> 114015 114290 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114016 114291 ··· 114528 114803 Reviewed-by: Keith Packard <keithp@keithp.com> 114529 114804 114530 114805 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114531 114531 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114806 114806 + Merge: 400ddf2f5 639600fa7 114532 114807 Author: Keith Packard <keithp@keithp.com> 114533 114808 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114534 114809 114535 114810 Merge remote branch 'whot/for-keith' 114536 114811 114537 114812 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114538 114538 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114813 114813 + Merge: 7250f078c e074f745a 114539 114814 Author: Keith Packard <keithp@keithp.com> 114540 114815 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114541 114816 ··· 114885 115160 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 114886 115161 114887 115162 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114888 114888 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115163 115163 + Merge: 3051dd513 c8998af3e 114889 115164 Author: Keith Packard <keithp@keithp.com> 114890 115165 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114891 115166 114892 115167 Merge remote branch 'whot/for-keith' 114893 115168 114894 115169 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114895 114895 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115170 115170 + Merge: ed547a9fc c5975722a 114896 115171 Author: Keith Packard <keithp@keithp.com> 114897 115172 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114898 115173 114899 115174 Merge remote branch 'jeremyhu/master' 114900 115175 114901 115176 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114902 114902 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115177 115177 + Merge: 78f94f19a 84e8de127 114903 115178 Author: Keith Packard <keithp@keithp.com> 114904 115179 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 114905 115180 ··· 115170 115445 Reviewed-by: Adam Jackson <ajax@redhat.com> 115171 115446 115172 115447 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115173 115173 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115448 115448 + Merge: 19f43836d 4ed4915bc 115174 115449 Author: Peter Hutterer <peter.hutterer@who-t.net> 115175 115450 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115176 115451 ··· 115183 115458 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 115184 115459 115185 115460 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115186 115186 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115461 115461 + Merge: 291c39dfe ec1bfbc66 115187 115462 Author: Keith Packard <keithp@keithp.com> 115188 115463 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115189 115464 ··· 115243 115518 Signed-off-by: Keith Packard <keithp@keithp.com> 115244 115519 115245 115520 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115246 115246 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115521 115521 + Merge: 73f6de1ad 4132b1c59 115247 115522 Author: Keith Packard <keithp@keithp.com> 115248 115523 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115249 115524 115250 115525 Merge remote branch 'whot/for-keith' 115251 115526 115252 115527 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115253 115253 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115528 115528 + Merge: 333b6ed26 3dc3aefb8 115254 115529 Author: Keith Packard <keithp@keithp.com> 115255 115530 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115256 115531 ··· 115411 115686 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 115412 115687 115413 115688 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115414 115414 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115689 115689 + Merge: 383dfe23f 44e816541 115415 115690 Author: Keith Packard <keithp@keithp.com> 115416 115691 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115417 115692 ··· 115605 115880 Reviewed-by: Julien Cristau <jcristau@debian.org> 115606 115881 115607 115882 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115608 115608 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115883 115883 + Merge: fe8d122b1 f72aadd38 115609 115884 Author: Keith Packard <keithp@keithp.com> 115610 115885 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 115611 115886 ··· 116007 116282 Signed-off-by: Keith Packard <keithp@keithp.com> 116008 116283 116009 116284 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116010 116010 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116285 116285 + Merge: 8806a04f7 9872e0f01 116011 116286 Author: Keith Packard <keithp@keithp.com> 116012 116287 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116013 116288 ··· 116423 116698 Reviewed-by: Colin Harrison <colin.harrison@virgin.net> 116424 116699 116425 116700 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116426 116426 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116701 116701 + Merge: 5b98c6267 e354ccac3 116427 116702 Author: Keith Packard <keithp@keithp.com> 116428 116703 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116429 116704 ··· 116634 116909 Signed-off-by: Adam Jackson <ajax@redhat.com> 116635 116910 116636 116911 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116637 116637 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116912 116912 + Merge: 693e92d40 23229c7ce 116638 116913 Author: Peter Hutterer <peter.hutterer@who-t.net> 116639 116914 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 116640 116915 ··· 117041 117316 Signed-off-by: Keith Packard <keithp@keithp.com> 117042 117317 117043 117318 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117044 117044 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117319 117319 + Merge: 9df4fb0ad 682a3ee60 117045 117320 Author: Keith Packard <keithp@keithp.com> 117046 117321 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117047 117322 ··· 117217 117492 Signed-off-by: Keith Packard <keithp@keithp.com> 117218 117493 117219 117494 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117220 117220 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117495 117495 + Merge: 01ad3725a 402942cdb 117221 117496 Author: Keith Packard <keithp@keithp.com> 117222 117497 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117223 117498 ··· 117469 117744 Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> 117470 117745 117471 117746 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117472 117472 - commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117747 117747 + Merge: 5a725385f 207985363 117473 117748 Author: Keith Packard <keithp@keithp.com> 117474 117749 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 117475 117750 ··· 117859 118134 Signed-off-by: Keith Packard <keithp@keithp.com> 117860 118135 117861 118136 commit bbffb85461eb63bfb1e01e2cb9674607b9221604 117862 117862 - Merge: 9a1a4ccbe0 71972c2534 118137 118137 + Merge: 9a1a4ccbe 71972c253 117863 118138 Author: Keith Packard <keithp@keithp.com> 117864 118139 Date: Fri Sep 10 11:55:34 2010 -0700 117865 118140 ··· 117898 118173 Signed-off-by: Keith Packard <keithp@keithp.com> 117899 118174 117900 118175 commit ca0d578d29f37b61e62556fff59732741885625b 117901 117901 - Merge: cf88363db0 08adf41f63 118176 118176 + Merge: cf88363db 08adf41f6 117902 118177 Author: Keith Packard <keithp@keithp.com> 117903 118178 Date: Fri Sep 10 11:50:27 2010 -0700 117904 118179 ··· 117928 118203 Signed-off-by: Keith Packard <keithp@keithp.com> 117929 118204 117930 118205 commit fa22f97af65efc2a147e9be0b7f288848965ff60 117931 117931 - Merge: 6edbdb7f9e 6546665293 118206 118206 + Merge: 6edbdb7f9 654666529 117932 118207 Author: Keith Packard <keithp@keithp.com> 117933 118208 Date: Fri Sep 10 11:47:41 2010 -0700 117934 118209 ··· 119553 119828 commit d4b8f7602b5e266a0ebd3b1ba23724362cc7de3a 119554 119829 119555 119830 commit 9fbbff3c0456f1969d45cc957d3260723caf62d7 119556 119556 - Merge: 95756f410c 9ac8e206ff 119831 119831 + Merge: 95756f410 9ac8e206f 119557 119832 Author: Keith Packard <keithp@keithp.com> 119558 119833 Date: Wed Jul 21 11:56:39 2010 -0700 119559 119834 ··· 119638 119913 Signed-off-by: Keith Packard <keithp@keithp.com> 119639 119914 119640 119915 commit 0fc02c0bf92f694889589e3648acc08d4684de37 119641 119641 - Merge: 0540c46066 9d8ec712a6 119916 119916 + Merge: 0540c4606 9d8ec712a 119642 119917 Author: Keith Packard <keithp@keithp.com> 119643 119918 Date: Tue Jul 13 15:05:36 2010 -0700 119644 119919 ··· 119735 120010 Signed-off-by: Keith Packard <keithp@keithp.com> 119736 120011 119737 120012 commit 2307ab5bc9365ebbe04568edb7c7620a23689b70 119738 119738 - Merge: c65280ce8d fd4f5059f0 120013 120013 + Merge: c65280ce8 fd4f5059f 119739 120014 Author: Keith Packard <keithp@keithp.com> 119740 120015 Date: Tue Jul 6 23:54:54 2010 -0400 119741 120016 ··· 119898 120173 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 119899 120174 119900 120175 commit 69b2b5c85ec079ef49f84722daa5f148cedc2e1b 119901 119901 - Merge: b90faa7156 1432785839 120176 120176 + Merge: b90faa715 143278583 119902 120177 Author: Keith Packard <keithp@keithp.com> 119903 120178 Date: Thu Jul 1 23:46:53 2010 -0400 119904 120179 ··· 120715 120990 Signed-off-by: Keith Packard <keithp@keithp.com> 120716 120991 120717 120992 commit a41d6e9bffbe56cfa1c3b84388a3d9f5a982f1a9 120718 120718 - Merge: 7e8f100121 f4190feb25 120993 120993 + Merge: 7e8f10012 f4190feb2 120719 120994 Author: Keith Packard <keithp@keithp.com> 120720 120995 Date: Fri Jun 11 10:08:13 2010 -0700 120721 120996 ··· 120868 121143 Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> 120869 121144 120870 121145 commit 620ca54aaa0b363fcf68cec1bd6c37e68c988352 120871 120871 - Merge: fd69234db0 8ff9b502cf 121146 121146 + Merge: fd69234db 8ff9b502c 120872 121147 Author: Keith Packard <keithp@keithp.com> 120873 121148 Date: Thu Jun 10 19:18:53 2010 -0700 120874 121149 ··· 120940 121215 Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> 120941 121216 120942 121217 commit 07a093add0b7e40c4d9b9b59273e3ff9e14a88a7 120943 120943 - Merge: 84190d2095 dc614484f9 121218 121218 + Merge: 84190d209 dc614484f 120944 121219 Author: Keith Packard <keithp@keithp.com> 120945 121220 Date: Thu Jun 10 18:39:10 2010 -0700 120946 121221 ··· 121092 121367 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 121093 121368 121094 121369 commit 84190d20954ef7888e4d96832c2a4b3225b4dfa2 121095 121095 - Merge: 4172aa137c 5e1ef1f4dd 121370 121370 + Merge: 4172aa137 5e1ef1f4d 121096 121371 Author: Keith Packard <keithp@keithp.com> 121097 121372 Date: Thu Jun 10 13:36:35 2010 -0700 121098 121373 ··· 121420 121695 Reviewed-by: Daniel Stone <daniel@fooishbar.org> 121421 121696 121422 121697 commit 5d4e2c594059ffb536c8e506c2623320d3c6a787 121423 121423 - Merge: eacc42132e 793dd39946 121698 121698 + Merge: eacc42132 793dd3994 121424 121699 Author: Keith Packard <keithp@keithp.com> 121425 121700 Date: Sat Jun 5 22:20:28 2010 -0700 121426 121701 ··· 121825 122100 Signed-off-by: Keith Packard <keithp@keithp.com> 121826 122101 121827 122102 commit 0f12e86e600522768f5f64eafc1230526e700ab7 121828 121828 - Merge: aa7c09f7d0 f114f54986 122103 122103 + Merge: aa7c09f7d f114f5498 121829 122104 Author: Keith Packard <keithp@keithp.com> 121830 122105 Date: Thu Jun 3 15:09:32 2010 -0700 121831 122106 ··· 122007 122282 Signed-off-by: Keith Packard <keithp@keithp.com> 122008 122283 122009 122284 commit b13d7a8e09c8e3eb5003420c3c0484431e5a052b 122010 122010 - Merge: f0ab726d89 dcceb90b1d 122285 122285 + Merge: f0ab726d8 dcceb90b1 122011 122286 Author: Keith Packard <keithp@keithp.com> 122012 122287 Date: Thu Jun 3 07:01:26 2010 -0700 122013 122288 ··· 122472 122747 Reviewed-by: Dan Nicholson <dbn.lists@gmail.com> 122473 122748 122474 122749 commit b11465a6ecdc2b8373e6fc8af427edc4602bcaa1 122475 122475 - Merge: 7c085aebfe 0abf065e38 122750 122750 + Merge: 7c085aebf 0abf065e3 122476 122751 Author: Keith Packard <keithp@keithp.com> 122477 122752 Date: Mon May 24 22:18:31 2010 -0700 122478 122753 ··· 122611 122886 Reviewed-by: Alex Deucher <alexdeucher@gmail.com> 122612 122887 122613 122888 commit 2ffffb4daf6161e6a22d81442ecf6209acc9e975 122614 122614 - Merge: b5e0f6d8f4 d5306084b5 122889 122889 + Merge: b5e0f6d8f d5306084b 122615 122890 Author: Keith Packard <keithp@keithp.com> 122616 122891 Date: Sun May 23 23:22:08 2010 -0700 122617 122892 ··· 122986 123261 Signed-off-by: Keith Packard <keithp@keithp.com> 122987 123262 122988 123263 commit 103507af0c0ce7d7482a67163249864af36a2374 122989 122989 - Merge: 8bd8d81dc4 99fcf655bd 123264 123264 + Merge: 8bd8d81dc 99fcf655b 122990 123265 Author: Keith Packard <keithp@keithp.com> 122991 123266 Date: Wed May 19 22:27:53 2010 -0700 122992 123267 122993 123268 Merge remote branch 'vignatti/bus-cleanup' 122994 123269 122995 123270 commit 8bd8d81dc473bf72ea108b1896a55e32defa02e2 122996 122996 - Merge: c620a1c0a4 66d5ecc5fd 123271 123271 + Merge: c620a1c0a 66d5ecc5f 122997 123272 Author: Keith Packard <keithp@keithp.com> 122998 123273 Date: Wed May 19 22:27:20 2010 -0700 122999 123274 ··· 123013 123288 Signed-off-by: Keith Packard <keithp@keithp.com> 123014 123289 123015 123290 commit 8b6c1809c09f832051327d86e1a25dc0ec5cc878 123016 123016 - Merge: d88ba7721d c38552d115 123291 123291 + Merge: d88ba7721 c38552d11 123017 123292 Author: Keith Packard <keithp@keithp.com> 123018 123293 Date: Wed May 19 12:58:02 2010 -0700 123019 123294 ··· 123489 123764 Signed-off-by: Keith Packard <keithp@keithp.com> 123490 123765 123491 123766 commit f87002cb7d8729b1da4cbefe7653f4cfd3a2d956 123492 123492 - Merge: a4fbc0feda 890f536f8d 123767 123767 + Merge: a4fbc0fed 890f536f8 123493 123768 Author: Keith Packard <keithp@keithp.com> 123494 123769 Date: Fri May 14 11:46:29 2010 -0700 123495 123770 ··· 123527 123802 Reviewed-by: Keith Packard <keithp@keithp.com> 123528 123803 123529 123804 commit 795432d4a92ed5b9fa4d9163e73c8e4fe4c74534 123530 123530 - Merge: f2a0c324e3 92ed75ac59 123805 123805 + Merge: f2a0c324e 92ed75ac5 123531 123806 Author: Keith Packard <keithp@keithp.com> 123532 123807 Date: Thu May 13 18:22:49 2010 -0700 123533 123808 ··· 123809 124084 Reviewed-by: Eamon Walsh <ewalsh@tycho.nsa.gov> 123810 124085 123811 124086 commit 59857ee5da5f1f3f4900292581b9586477513211 123812 123812 - Merge: 21ceae9002 432cbbec19 124087 124087 + Merge: 21ceae900 432cbbec1 123813 124088 Author: Keith Packard <keithp@keithp.com> 123814 124089 Date: Wed May 12 16:48:08 2010 -0700 123815 124090 ··· 124030 124305 Reviewed-by: Adam Jackson <ajax@redhat.com> 124031 124306 124032 124307 commit 3df22b293c1f1d27e7ce16662744c578d35b5aba 124033 124033 - Merge: fa6c701257 9de0e31746 124308 124308 + Merge: fa6c70125 9de0e3174 124034 124309 Author: Keith Packard <keithp@keithp.com> 124035 124310 Date: Tue May 11 08:38:44 2010 -0700 124036 124311 ··· 124160 124435 Signed-off-by: Keith Packard <keithp@keithp.com> 124161 124436 124162 124437 commit 95074538cce93abc1739a4d9dd78b0500fb8fec9 124163 124163 - Merge: c0799779df 2160ff5240 124438 124438 + Merge: c0799779d 2160ff524 124164 124439 Author: Keith Packard <keithp@keithp.com> 124165 124440 Date: Mon May 10 13:49:33 2010 -0700 124166 124441 ··· 124388 124663 Signed-off-by: Keith Packard <keithp@keithp.com> 124389 124664 124390 124665 commit a80b1f888f2f7674a715d512ab950eeadee20448 124391 124391 - Merge: 4971099860 0efd7b8d82 124666 124666 + Merge: 497109986 0efd7b8d8 124392 124667 Author: Keith Packard <keithp@keithp.com> 124393 124668 Date: Sun May 2 16:35:17 2010 -0700 124394 124669 ··· 124497 124772 Signed-off-by: Keith Packard <keithp@keithp.com> 124498 124773 124499 124774 commit 986d46144b183a36b4e98aed95eca0c55a8b4251 124500 124500 - Merge: a974c8e7cb b5b8f91b82 124775 124775 + Merge: a974c8e7c b5b8f91b8 124501 124776 Author: Keith Packard <keithp@keithp.com> 124502 124777 Date: Fri Apr 30 12:40:53 2010 -0700 124503 124778 ··· 124507 124782 hw/xfree86/common/xf86xv.c 124508 124783 124509 124784 commit a974c8e7cba40c8d7d1b91e07de8c414627b71a2 124510 124510 - Merge: 6581bc4591 02e86221b8 124785 124785 + Merge: 6581bc459 02e86221b 124511 124786 Author: Keith Packard <keithp@keithp.com> 124512 124787 Date: Fri Apr 30 12:33:00 2010 -0700 124513 124788 124514 124789 Merge remote branch 'whot/for-keith' 124515 124790 124516 124791 commit 6581bc4591746c906d97f8b868f946c47bc6d756 124517 124517 - Merge: 0e91e19f78 d073e51bee 124792 124792 + Merge: 0e91e19f7 d073e51be 124518 124793 Author: Keith Packard <keithp@keithp.com> 124519 124794 Date: Fri Apr 30 12:29:52 2010 -0700 124520 124795 124521 124796 Merge remote branch 'yselkowitz/master' 124522 124797 124523 124798 commit 0e91e19f783d21198fc2e210203e0f10040a9cd0 124524 124524 - Merge: 81a081c1f0 edbc56c088 124799 124799 + Merge: 81a081c1f edbc56c08 124525 124800 Author: Keith Packard <keithp@keithp.com> 124526 124801 Date: Fri Apr 30 12:27:51 2010 -0700 124527 124802 ··· 124715 124990 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 124716 124991 124717 124992 commit 3f63db89191701139d45332ca80b9d6eb327c773 124718 124718 - Merge: 41bdb6c003 54e51de8cd 124993 124993 + Merge: 41bdb6c00 54e51de8c 124719 124994 Author: Keith Packard <keithp@keithp.com> 124720 124995 Date: Mon Apr 26 20:18:13 2010 -0700 124721 124996 ··· 125112 125387 Signed-off-by: Keith Packard <keithp@keithp.com> 125113 125388 125114 125389 commit 7ac6a6b7d0dfc5e021270b2898accd3425aa008a 125115 125115 - Merge: 0782894b57 f7ef6fd9a1 125390 125390 + Merge: 0782894b5 f7ef6fd9a 125116 125391 Author: Keith Packard <keithp@keithp.com> 125117 125392 Date: Wed Apr 21 16:07:38 2010 -0700 125118 125393 ··· 125370 125645 Signed-off-by: Keith Packard <keithp@keithp.com> 125371 125646 125372 125647 commit b3ab978df861c08298f57529e3db980489055c35 125373 125373 - Merge: a92b2c2c8d 0ad022a729 125648 125648 + Merge: a92b2c2c8 0ad022a72 125374 125649 Author: Keith Packard <keithp@keithp.com> 125375 125650 Date: Sun Apr 18 22:01:40 2010 -0700 125376 125651 ··· 125532 125807 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 125533 125808 125534 125809 commit e424d5812300e82de375d83dc0b490a76d865016 125535 125535 - Merge: 5b0faf3554 0e7703f9b1 125810 125810 + Merge: 5b0faf355 0e7703f9b 125536 125811 Author: Keith Packard <keithp@keithp.com> 125537 125812 Date: Thu Apr 15 15:01:34 2010 -0700 125538 125813 ··· 125718 125993 Signed-off-by: Keith Packard <keithp@keithp.com> 125719 125994 125720 125995 commit ab60975fe28cb135b4183c57b7f50d3615921c1f 125721 125721 - Merge: adbbc66108 59edde7c28 125996 125996 + Merge: adbbc6610 59edde7c2 125722 125997 Author: Keith Packard <keithp@keithp.com> 125723 125998 Date: Mon Apr 12 21:40:41 2010 -0700 125724 125999 ··· 125778 126053 Reviewed-by: Keith Packard <keithp@keithp.com> 125779 126054 125780 126055 commit d7c98c1c81ae272f66edb05fde20f4c616604add 125781 125781 - Merge: 82cf3a4ae0 03ccbd2579 126056 126056 + Merge: 82cf3a4ae 03ccbd257 125782 126057 Author: Keith Packard <keithp@keithp.com> 125783 126058 Date: Wed Apr 7 22:25:51 2010 -0700 125784 126059 ··· 125946 126221 Signed-off-by: Keith Packard <keithp@keithp.com> 125947 126222 125948 126223 commit cbda58c963af5bb9c4643e9017dd4eec589ceff3 125949 125949 - Merge: a7698a6776 c983f40fe4 126224 126224 + Merge: a7698a677 c983f40fe 125950 126225 Author: Keith Packard <keithp@keithp.com> 125951 126226 Date: Wed Apr 7 15:51:38 2010 -0700 125952 126227 125953 126228 Merge remote branch 'yselkowitz/master' 125954 126229 125955 126230 commit a7698a677682a32960b885c22fdba2add70f4658 125956 125956 - Merge: 495cec794d 165a4a9c7d 126231 126231 + Merge: 495cec794 165a4a9c7 125957 126232 Author: Keith Packard <keithp@keithp.com> 125958 126233 Date: Tue Apr 6 12:36:15 2010 -0700 125959 126234 ··· 126100 126375 Signed-off-by: Keith Packard <keithp@keithp.com> 126101 126376 126102 126377 commit 57cb1a854a1b6d91d214b3fa250a7df2ed20d433 126103 126103 - Merge: 4b3d67a764 28a5f14b40 126378 126378 + Merge: 4b3d67a76 28a5f14b4 126104 126379 Author: Keith Packard <keithp@keithp.com> 126105 126380 Date: Mon Mar 29 11:46:00 2010 -0700 126106 126381 126107 126382 Merge remote branch 'jeremyhu/master' 126108 126383 126109 126384 commit 4b3d67a7647f696957727948f9757a261e15d14e 126110 126110 - Merge: 579715f830 aa91508356 126385 126385 + Merge: 579715f83 aa9150835 126111 126386 Author: Keith Packard <keithp@keithp.com> 126112 126387 Date: Mon Mar 29 11:44:07 2010 -0700 126113 126388 ··· 126524 126799 Signed-off-by: Keith Packard <keithp@keithp.com> 126525 126800 126526 126801 commit b29220dc765cb6f878c5466e00e4bd21f3bd803d 126527 126527 - Merge: c3da76643a ed31d50b5f 126802 126802 + Merge: c3da76643 ed31d50b5 126528 126803 Author: Keith Packard <keithp@keithp.com> 126529 126804 Date: Sun Mar 21 23:01:58 2010 -0700 126530 126805 ··· 126772 127047 Bump to 1.7.99.902 -- 1.8 RC2 126773 127048 126774 127049 commit 235fa5030428084368e5be57fca695647b7b79c4 126775 126775 - Merge: 1c612acca8 fa5103a02b 127050 127050 + Merge: 1c612acca fa5103a02 126776 127051 Author: Keith Packard <keithp@keithp.com> 126777 127052 Date: Sun Mar 21 15:38:40 2010 -0700 126778 127053 ··· 126798 127073 Signed-off-by: Keith Packard <keithp@keithp.com> 126799 127074 126800 127075 commit 95ca39b981624df5338a16b506289014c431ae82 126801 126801 - Merge: e7ff956638 bf181915e1 127076 127076 + Merge: e7ff95663 bf181915e 126802 127077 Author: Keith Packard <keithp@keithp.com> 126803 127078 Date: Sun Mar 21 15:24:06 2010 -0700 126804 127079 ··· 126986 127261 Signed-off-by: Keith Packard <keithp@keithp.com> 126987 127262 126988 127263 commit df9b6f16b27398545cd4cff8a56dd59a3813351d 126989 126989 - Merge: 5f169f5493 5172253bae 127264 127264 + Merge: 5f169f549 5172253ba 126990 127265 Author: Keith Packard <keithp@keithp.com> 126991 127266 Date: Mon Mar 15 08:26:58 2010 -0700 126992 127267 ··· 127311 127586 Signed-off-by: Keith Packard <keithp@keithp.com> 127312 127587 127313 127588 commit 780c95caf9888fa4548dfe4c1c78a7e7ce99a9ed 127314 127314 - Merge: 018b177591 758f697175 127589 127589 + Merge: 018b17759 758f69717 127315 127590 Author: Keith Packard <keithp@keithp.com> 127316 127591 Date: Wed Feb 24 09:59:19 2010 -0800 127317 127592 ··· 127479 127754 Signed-off-by: Keith Packard <keithp@keithp.com> 127480 127755 127481 127756 commit ca9c2472d74c7107ccc117e2c9c723c168d2eccf 127482 127482 - Merge: e40ba5798c 02d1116e7e 127757 127757 + Merge: e40ba5798 02d1116e7 127483 127758 Author: Keith Packard <keithp@keithp.com> 127484 127759 Date: Mon Feb 22 13:26:06 2010 -0800 127485 127760 ··· 127817 128092 Bump to 1.7.99.901 -- 1.8 RC1 127818 128093 127819 128094 commit 57ffeb3f2b3313dcef92a396f1f55fdbc064b2c5 127820 127820 - Merge: c6d9bc092c c76248fda9 128095 128095 + Merge: c6d9bc092 c76248fda 127821 128096 Author: Keith Packard <keithp@keithp.com> 127822 128097 Date: Fri Feb 12 13:36:32 2010 -0800 127823 128098 ··· 128544 128819 Signed-off-by: Keith Packard <keithp@keithp.com> 128545 128820 128546 128821 commit 0b21a0416b4cb2c32da5e3fda05a0682eb97d56e 128547 128547 - Merge: 1e6fd65d0b 837bd2bbc0 128822 128822 + Merge: 1e6fd65d0 837bd2bbc 128548 128823 Author: Keith Packard <keithp@keithp.com> 128549 128824 Date: Wed Jan 27 14:14:15 2010 -0800 128550 128825 ··· 128863 129138 Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org> 128864 129139 128865 129140 commit 44f9c3d16c9c9b3362306a9ba26ee52e7baafeca 128866 128866 - Merge: 032f97808c 84956ca43b 129141 129141 + Merge: 032f97808 84956ca43 128867 129142 Author: Keith Packard <keithp@keithp.com> 128868 129143 Date: Wed Jan 13 10:19:21 2010 -0800 128869 129144 ··· 129019 129294 Signed-off-by: Keith Packard <keithp@keithp.com> 129020 129295 129021 129296 commit 8ab4749aaefb3727b9fc58bb37b50a2d07eb1531 129022 129022 - Merge: 8d53d84485 9437504b21 129297 129297 + Merge: 8d53d8448 9437504b2 129023 129298 Author: Keith Packard <keithp@keithp.com> 129024 129299 Date: Thu Jan 7 10:32:21 2010 -0800 129025 129300 ··· 129382 129657 Signed-off-by: Julien Cristau <jcristau@debian.org> 129383 129658 129384 129659 commit 9fad8f06fb89ac2ae05bea0fa24cab3df7677297 129385 129385 - Merge: 871bbe1d87 42e8c9224e 129660 129660 + Merge: 871bbe1d8 42e8c9224 129386 129661 Author: Keith Packard <keithp@keithp.com> 129387 129662 Date: Wed Dec 30 09:28:19 2009 -0800 129388 129663 129389 129664 Merge remote branch 'dbn/inputclass' 129390 129665 129391 129666 commit 871bbe1d87fa3c7ebd075e1d1eec33e45b08493d 129392 129392 - Merge: db2c6f7c91 e1165632bd 129667 129667 + Merge: db2c6f7c9 e1165632b 129393 129668 Author: Keith Packard <keithp@keithp.com> 129394 129669 Date: Wed Dec 30 09:16:45 2009 -0800 129395 129670 ··· 129704 129979 Signed-off-by: Keith Packard <keithp@keithp.com> 129705 129980 129706 129981 commit 7dc78db79edd15b971110acaf16bbe7f69e40bdb 129707 129707 - Merge: 81a623f036 b44c9be244 129982 129982 + Merge: 81a623f03 b44c9be24 129708 129983 Author: Keith Packard <keithp@keithp.com> 129709 129984 Date: Tue Dec 22 21:25:18 2009 -0800 129710 129985 ··· 129885 130160 Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com> 129886 130161 129887 130162 commit 0cb638dc6822e54567a1731ea1cf588475a226e9 129888 129888 - Merge: 6a6a041c2d fbdf493a3e 130163 130163 + Merge: 6a6a041c2 fbdf493a3 129889 130164 Author: Keith Packard <keithp@keithp.com> 129890 130165 Date: Wed Dec 16 21:58:44 2009 -0800 129891 130166 129892 130167 Merge remote branch 'alanc/master' 129893 130168 129894 130169 commit 6a6a041c2d8d32f6355db77cd59cff371038c683 129895 129895 - Merge: 8127465f44 d503195504 130170 130170 + Merge: 8127465f4 d50319550 129896 130171 Author: Keith Packard <keithp@keithp.com> 129897 130172 Date: Wed Dec 16 21:57:32 2009 -0800 129898 130173 ··· 130159 130434 Acked-by: Soeren Sandmann <sandmann@daimi.au.dk> 130160 130435 130161 130436 commit d3e054ac07dae12a82ad764b0622fddbef4b9ec5 130162 130162 - Merge: 12fb31815d 97a6454ea5 130437 130437 + Merge: 12fb31815 97a6454ea 130163 130438 Author: Keith Packard <keithp@keithp.com> 130164 130439 Date: Fri Dec 11 09:22:22 2009 -0800 130165 130440 ··· 130378 130653 Signed-off-by: Keith Packard <keithp@keithp.com> 130379 130654 130380 130655 commit 98c8b752254a27ab1aaf881b36bfda0f74929d0a 130381 130381 - Merge: 0e084d8c71 91c1bd78f7 130656 130656 + Merge: 0e084d8c7 91c1bd78f 130382 130657 Author: Keith Packard <keithp@keithp.com> 130383 130658 Date: Wed Dec 2 15:28:07 2009 -0800 130384 130659 ··· 131376 131651 Signed-off-by: Keith Packard <keithp@keithp.com> 131377 131652 131378 131653 commit 7442f3355ab8f0bb2b1a270da18c65d8d315d4dd 131379 131379 - Merge: 0573042cdd 7897b6c2d4 131654 131654 + Merge: 0573042cd 7897b6c2d 131380 131655 Author: Keith Packard <keithp@keithp.com> 131381 131656 Date: Wed Nov 4 08:55:20 2009 -0800 131382 131657 ··· 131637 131912 Signed-off-by: Keith Packard <keithp@keithp.com> 131638 131913 131639 131914 commit deb72fc61464250af8185dab2da8ee09f13c55d8 131640 131640 - Merge: 55f4c80a4c a60e676f1f 131915 131915 + Merge: 55f4c80a4 a60e676f1 131641 131916 Author: Keith Packard <keithp@keithp.com> 131642 131917 Date: Wed Oct 28 10:54:13 2009 -0700 131643 131918 ··· 131788 132063 Signed-off-by: Keith Packard <keithp@keithp.com> 131789 132064 131790 132065 commit 1228e2d052f0bb98175c55c194340773b5fedb40 131791 131791 - Merge: 08e7f62faf 52bc6d9449 132066 132066 + Merge: 08e7f62fa 52bc6d944 131792 132067 Author: Keith Packard <keithp@keithp.com> 131793 132068 Date: Wed Oct 21 22:46:53 2009 +0900 131794 132069 ··· 132218 132493 Signed-off-by: Keith Packard <keithp@keithp.com> 132219 132494 132220 132495 commit 6e158003e80534ce007290f75c89d698aec1d00b 132221 132221 - Merge: 2b14e14203 5e762f0e2f 132496 132496 + Merge: 2b14e1420 5e762f0e2 132222 132497 Author: Keith Packard <keithp@keithp.com> 132223 132498 Date: Tue Oct 13 18:40:42 2009 -0700 132224 132499 ··· 132460 132735 Signed-off-by: Keith Packard <keithp@keithp.com> 132461 132736 132462 132737 commit 68304215e25876ee639015969b4f07e1c9c515e0 132463 132463 - Merge: 6676f49e34 315aaef557 132738 132738 + Merge: 6676f49e3 315aaef55 132464 132739 Author: Keith Packard <keithp@keithp.com> 132465 132740 Date: Tue Oct 6 22:41:42 2009 -0700 132466 132741 ··· 139863 140138 xace: fix a bad send access hook call. 139864 140139 139865 140140 commit 993daf06497c85bb6a1e70592df380503d721dfb 139866 139866 - Merge: 2bda50ee14 e1e8c7ddd7 140141 140141 + Merge: 2bda50ee1 e1e8c7ddd 139867 140142 Author: Peter Hutterer <peter.hutterer@who-t.net> 139868 140143 Date: Thu Jun 4 15:11:36 2009 +1000 139869 140144 ··· 139926 140201 s/MIN/min/, s/MAX/max/ (#2968) 139927 140202 139928 140203 commit 6de67d3206f0a4e307070714564c19efc84da2ec 139929 139929 - Merge: af4e658401 7f027d9dc0 140204 140204 + Merge: af4e65840 7f027d9dc 139930 140205 Author: Peter Hutterer <peter.hutterer@who-t.net> 139931 140206 Date: Wed Jun 3 16:11:33 2009 +1000 139932 140207 ··· 140321 140596 These have been nops since 2006 and functionally void since 7.0. 140322 140597 140323 140598 commit d7aef3f663f4b5d861799f8615dcd301d5ce2906 140324 140324 - Merge: a25f248fc3 e08c6a0752 140599 140599 + Merge: a25f248fc e08c6a075 140325 140600 Author: Peter Hutterer <peter.hutterer@who-t.net> 140326 140601 Date: Thu May 28 17:20:58 2009 +1000 140327 140602 ··· 140373 140648 Signed-off-by: Federico Mena Quintero <federico@novell.com> 140374 140649 140375 140650 commit b12010e10f38951358b48ff1076c026f943b7cc3 140376 140376 - Merge: 6e69272473 f1441b8353 140651 140651 + Merge: 6e6927247 f1441b835 140377 140652 Author: Søren Sandmann Pedersen <sandmann@redhat.com> 140378 140653 Date: Wed May 27 15:56:30 2009 -0400 140379 140654 ··· 142207 142482 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 142208 142483 142209 142484 commit 057fc9a4f89282e440b5e11458f1dd8655879dd8 142210 142210 - Merge: 95628b797e 932d6bcbb6 142485 142485 + Merge: 95628b797 932d6bcbb 142211 142486 Author: Peter Hutterer <peter.hutterer@who-t.net> 142212 142487 Date: Fri Apr 24 16:15:47 2009 +1000 142213 142488 ··· 142383 142658 Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> 142384 142659 142385 142660 commit d5ad14c8ed4d8360e1df8cd0bacf6a7c9c31df91 142386 142386 - Merge: 54716fd3db 0e0642ee94 142661 142661 + Merge: 54716fd3d 0e0642ee9 142387 142662 Author: Peter Hutterer <peter.hutterer@who-t.net> 142388 142663 Date: Sun Apr 19 22:28:22 2009 +1000 142389 142664 ··· 143210 143485 Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com> 143211 143486 143212 143487 commit 6c3b633299f12051fcf37fb8439f358de876cf03 143213 143213 - Merge: adf21dba76 0cfd481308 143488 143488 + Merge: adf21dba7 0cfd48130 143214 143489 Author: Peter Hutterer <peter.hutterer@who-t.net> 143215 143490 Date: Tue Apr 7 19:36:27 2009 +1000 143216 143491 ··· 149711 149986 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> 149712 149987 149713 149988 commit 22d4ddcc3d63b7fbf2a23f5162075e4ee06db781 149714 149714 - Merge: d2dad384f5 c3bf15ba85 149989 149989 + Merge: d2dad384f c3bf15ba8 149715 149990 Author: Matthieu Herrb <matthieu@crux.(none)> 149716 149991 Date: Sun Dec 7 23:56:15 2008 +0100 149717 149992 ··· 150667 150942 New version of dolt 150668 150943 150669 150944 commit 4715f079b9c61362755c95c1ebf89c97cc6fff2b 150670 150670 - Merge: 9ffc671939 ed597f19fd 150945 150945 + Merge: 9ffc67193 ed597f19f 150671 150946 Author: Keith Packard <keithp@keithp.com> 150672 150947 Date: Tue Nov 25 22:19:08 2008 -0800 150673 150948 ··· 151548 151823 Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com> 151549 151824 151550 151825 commit 387563b77743d92be83420d982eaf57f5459a883 151551 151551 - Merge: 85f650c9b7 f6e01fa1b8 151826 151826 + Merge: 85f650c9b f6e01fa1b 151552 151827 Author: Matthieu Herrb <matthieu.herrb@laas.fr> 151553 151828 Date: Sun Nov 23 13:15:46 2008 +0100 151554 151829 ··· 151950 152225 Signed-off-by: James Cloos <cloos@jhcloos.com> 151951 152226 151952 152227 commit ba4e08244ed3923eecf26842dfc1df17c696e053 151953 151953 - Merge: 81fd17f5f4 5bad5d2abe 152228 152228 + Merge: 81fd17f5f 5bad5d2ab 151954 152229 Author: Alex Deucher <alexdeucher@gmail.com> 151955 152230 Date: Thu Nov 13 15:04:18 2008 -0500 151956 152231 ··· 159054 159329 Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au> 159055 159330 159056 159331 commit 26c1958c322be3ac4dfec9ba2c41c5202bd03709 159057 159057 - Merge: 5fe57787fa 29586101dc 159332 159332 + Merge: 5fe57787f 29586101d 159058 159333 Author: Peter Hutterer <peter@cs.unisa.edu.au> 159059 159334 Date: Mon May 26 17:37:31 2008 +0930 159060 159335 ··· 159533 159808 Big boss says UniSA isn't unique enough. Who am I to argue? 159534 159809 159535 159810 commit 7509fb498c02fe1cebe4139612b8871ec877c130 159536 159536 - Merge: 2ae3bed337 dfb7de6571 159811 159811 + Merge: 2ae3bed33 dfb7de657 159537 159812 Author: Peter Hutterer <peter@cs.unisa.edu.au> 159538 159813 Date: Wed May 21 16:25:35 2008 +0930 159539 159814 ··· 159593 159868 fb: shut up two compiler warnings. 159594 159869 159595 159870 commit 99d28c3ef37aeffe7d8ec41e45a650ba248c6958 159596 159596 - Merge: fc7e2566cc 0178b6a4ab 159871 159871 + Merge: fc7e2566c 0178b6a4a 159597 159872 Author: Peter Hutterer <peter@cs.unisa.edu.au> 159598 159873 Date: Tue May 20 10:20:14 2008 +0930 159599 159874 ··· 160193 160468 <http://bugs.opensolaris.org/bugdatabase/view_bug.do?bug_id=4258475> 160194 160469 160195 160470 commit 7b3066d9b9099135d9c49e0682161d5568fc535b 160196 160196 - Merge: 2a3d1421e0 315f089056 160471 160471 + Merge: 2a3d1421e 315f08905 160197 160472 Author: Drew Parsons <drew@emerall.com> 160198 160473 Date: Sat May 10 00:01:15 2008 +1000 160199 160474 ··· 160293 160568 Bug #13104: Remove broken XAA a1 glyph fast path. 160294 160569 160295 160570 commit ddaecfa13cefee7c66b39b606c8640c6544d4943 160296 160296 - Merge: 9c2e0871cf cf20df39cc 160571 160571 + Merge: 9c2e0871c cf20df39c 160297 160572 Author: Adam Jackson <ajax@redhat.com> 160298 160573 Date: Thu May 8 14:33:58 2008 -0400 160299 160574 ··· 160551 160826 xfree86: don't try to repaint the cursor before cursors exist. 160552 160827 160553 160828 commit 334456952930cb3e55c02fcdada2d0c074cd0520 160554 160554 - Merge: 8e56fd9728 3b8d53452c 160829 160829 + Merge: 8e56fd972 3b8d53452 160555 160830 Author: Peter Hutterer <peter@cs.unisa.edu.au> 160556 160831 Date: Fri May 2 11:00:14 2008 +0930 160557 160832 ··· 161460 161735 (cherry picked from commit a033c0b3dbb3b963261faa39f0236457cb00ff44) 161461 161736 161462 161737 commit 8190ef87547b704848231bde10b1cdffc6442790 161463 161463 - Merge: 179a082c26 2ddbfd3457 161738 161738 + Merge: 179a082c2 2ddbfd345 161464 161739 Author: Peter Hutterer <peter@cs.unisa.edu.au> 161465 161740 Date: Tue Apr 22 18:04:05 2008 +0930 161466 161741 ··· 162098 162373 EXA: Teach exaCompositeFallbackPictDesc() about x8r8g8b8. 162099 162374 162100 162375 commit 1a9d7205cd5640eb65f019336097d86301942ea7 162101 162101 - Merge: 90f491cf8e 6866e84e3c 162376 162376 + Merge: 90f491cf8 6866e84e3 162102 162377 Author: Peter Hutterer <peter@cs.unisa.edu.au> 162103 162378 Date: Mon Apr 14 16:25:58 2008 +0930 162104 162379 ··· 162283 162558 X.Org Bug 14418 <http://bugs.freedesktop.org/show_bug.cgi?id=14418> 162284 162559 162285 162560 commit 90f491cf8eb869f27c4278b26c1bb84432b12d63 162286 162286 - Merge: cbe01b3083 b4380d8030 162561 162561 + Merge: cbe01b308 b4380d803 162287 162562 Author: Peter Hutterer <peter@cs.unisa.edu.au> 162288 162563 Date: Fri Apr 11 08:29:52 2008 +0930 162289 162564 ··· 162476 162751 (cherry picked from commit 126e9bc8c480b403dedc44c1e8c4fe1476340ed9) 162477 162752 162478 162753 commit cbe01b3083eb65c9d4259b1071683febebf11600 162479 162479 - Merge: 5ffbcfec3d 389dae73cc 162754 162754 + Merge: 5ffbcfec3 389dae73c 162480 162755 Author: Peter Hutterer <peter@cs.unisa.edu.au> 162481 162756 Date: Wed Apr 9 10:46:46 2008 +0930 162482 162757 ··· 162576 162851 EXA: Fix TS origin computation when implementing RenderComposite with tiling. 162577 162852 162578 162853 commit fd06e8f8c1d82a9d91931e8532bee0fd9c9ca9ab 162579 162579 - Merge: b46a009186 6c0cfe3d43 162854 162854 + Merge: b46a00918 6c0cfe3d4 162580 162855 Author: Peter Hutterer <whot@potoroo.wearablelab.ml.unisa.edu.au> 162581 162856 Date: Mon Apr 7 07:56:41 2008 +0930 162582 162857 ··· 162588 162863 dix/dispatch.c 162589 162864 162590 162865 commit 539bf3c2836727e7560c64144071b086f8ea32fe 162591 162591 - Merge: 3ab33e7cd4 6c0cfe3d43 162866 162866 + Merge: 3ab33e7cd 6c0cfe3d4 162592 162867 Author: Sascha Hlusiak <saschahlusiak@arcor.de> 162593 162868 Date: Mon Apr 7 00:10:16 2008 +0200 162594 162869 ··· 163049 163324 RH BZ 435216 163050 163325 163051 163326 commit 9df915b84d45d39aed7557c98883b20a66da2e96 163052 163052 - Merge: 47eb658e80 333e7123dc 163327 163327 + Merge: 47eb658e8 333e7123d 163053 163328 Author: Sascha Hlusiak <saschahlusiak@arcor.de> 163054 163329 Date: Tue Mar 25 17:50:50 2008 +0100 163055 163330 ··· 163591 163866 XACE: Check the return value of the selection create hook call. 163592 163867 163593 163868 commit 4f2cd0ed96d3b10c78774c721c2ffbfb0556dddd 163594 163594 - Merge: 23ae68a4c7 453661a9e1 163869 163869 + Merge: 23ae68a4c 453661a9e 163595 163870 Author: Peter Hutterer <peter@cs.unisa.edu.au> 163596 163871 Date: Tue Mar 4 18:11:10 2008 +1030 163597 163872 ··· 165050 165325 Reviewed-by: Peter Hutterer <peter@cs.unisa.edu.au> 165051 165326 165052 165327 commit e5e531ce96264518f278f572a4d0bfcd345aa618 165053 165053 - Merge: 6c38682084 1692dcf197 165328 165328 + Merge: 6c3868208 1692dcf19 165054 165329 Author: Peter Hutterer <peter@cs.unisa.edu.au> 165055 165330 Date: Thu Jan 31 16:36:17 2008 +1030 165056 165331 ··· 165167 165442 (cherry picked from commit 116800279d2ec783c63f43d3902627edde6a4cff) 165168 165443 165169 165444 commit 16b0614c8c441eb1692bde9e58fadf54a9c6f00f 165170 165170 - Merge: 1a88aed5c8 e915a26397 165445 165445 + Merge: 1a88aed5c e915a2639 165171 165446 Author: David Nusinow <dnusinow@debian.org> 165172 165447 Date: Sat Jan 26 16:13:25 2008 -0500 165173 165448 165174 165449 Merge commit 'upstream/master' 165175 165450 165176 165451 commit 0ac175597712edfeae676f536746a4d26d625e30 165177 165177 - Merge: 210eeef495 e915a26397 165452 165452 + Merge: 210eeef49 e915a2639 165178 165453 Author: Peter Hutterer <peter@cs.unisa.edu.au> 165179 165454 Date: Sat Jan 26 13:55:07 2008 +1030 165180 165455 ··· 165628 165903 More Xv extension byte swapping fixes 165629 165904 165630 165905 commit 38bf01bd1c925614a6e67a38aa3cefc7b8fe3bca 165631 165631 - Merge: 4e85c7c322 0883e838e2 165906 165906 + Merge: 4e85c7c32 0883e838e 165632 165907 Author: Peter Hutterer <peter@cs.unisa.edu.au> 165633 165908 Date: Thu Jan 10 13:38:46 2008 +1030 165634 165909 ··· 165864 166139 dix: free ClassesRec when a BadAlloc occurs during CoreKeyboardProc. 165865 166140 165866 166141 commit 8da83836b60f7cdb75d08482f4311fa0e2ab4e1d 165867 165867 - Merge: eace88989c ae869fc766 166142 166142 + Merge: eace88989 ae869fc76 165868 166143 Author: Peter Hutterer <peter@cs.unisa.edu.au> 165869 166144 Date: Thu Jan 3 17:04:54 2008 +1030 165870 166145 ··· 166503 166778 Bump video driver ABI and extension ABI for devPrivates rework. 166504 166779 166505 166780 commit 86b2e59bfb79bd042a13c35fbb4ccecec576f629 166506 166506 - Merge: 1c1a4bc970 cb0d7e2c26 166781 166781 + Merge: 1c1a4bc97 cb0d7e2c2 166507 166782 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 166508 166783 Date: Fri Dec 14 00:32:24 2007 -0500 166509 166784 ··· 166551 166826 (cherry picked from commit fc04c9759b30d062111d4a7f3f411ed0f18cbde4) 166552 166827 166553 166828 commit c8feb73f5841e7812d8dfdb91f1064e2033d028c 166554 166554 - Merge: 9a7ce57363 a125ce4a84 166829 166829 + Merge: 9a7ce5736 a125ce4a8 166555 166830 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 166556 166831 Date: Thu Dec 13 18:38:25 2007 -0500 166557 166832 ··· 168018 168293 during merge conflict resolution. 168019 168294 168020 168295 commit 2d17f47cc7d6b174857617d31ad1b437d8e97d94 168021 168021 - Merge: 60be452c2e ea9c63e93b 168296 168296 + Merge: 60be452c2 ea9c63e93 168022 168297 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 168023 168298 Date: Mon Nov 19 18:10:46 2007 -0500 168024 168299 ··· 168346 168621 Don't sleep(1) at server exit. 168347 168622 168348 168623 commit 1603130236c55ddabc3854d4ba62d544debcf1f5 168349 168349 - Merge: f207e69d62 f7dd0c72b8 168624 168624 + Merge: f207e69d6 f7dd0c72b 168350 168625 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 168351 168626 Date: Wed Nov 14 13:35:50 2007 -0500 168352 168627 ··· 168723 168998 Also clean up to return error codes instead of sending the error manually. 168724 168999 168725 169000 commit 184a7b8917a15bb2c719153b9b016c03aab42101 168726 168726 - Merge: a8808ac3d0 0b729051c0 169001 169001 + Merge: a8808ac3d 0b729051c 168727 169002 Author: Peter Hutterer <peter@cs.unisa.edu.au> 168728 169003 Date: Thu Nov 8 09:34:35 2007 +1030 168729 169004 ··· 168734 169009 Xi/opendev.c 168735 169010 168736 169011 commit e94ab0b502160376d1956345196f7e1c7e2e886f 168737 168737 - Merge: 26e1fc7b42 9bee1c6912 169012 169012 + Merge: 26e1fc7b4 9bee1c691 168738 169013 Author: Dodji Seketeli <dodji@openedhand.com> 168739 169014 Date: Wed Nov 7 19:04:24 2007 +0100 168740 169015 ··· 168773 169048 XNEST_LIBS contains the right thing. 168774 169049 168775 169050 commit 0b729051c04da7068f1e6dd319190bd0a362b2c0 168776 168776 - Merge: b7ee005d32 d7c5e8bfc1 169051 169051 + Merge: b7ee005d3 d7c5e8bfc 168777 169052 Author: Peter Hutterer <peter@cs.unisa.edu.au> 168778 169053 Date: Wed Nov 7 15:37:23 2007 +1030 168779 169054 ··· 168872 169147 on the x11perf benchmark. 168873 169148 168874 169149 commit aaa50b64113b122aaebd46e3b78e3fb7a8d70500 168875 168875 - Merge: 868e303630 ddce48ede0 169150 169150 + Merge: 868e30363 ddce48ede 168876 169151 Author: Dodji Seketeli <dodji@openedhand.com> 168877 169152 Date: Tue Nov 6 16:25:40 2007 +0100 168878 169153 ··· 168899 169174 to subsequent assertion failure in libdbus. 168900 169175 168901 169176 commit a52c9b2a59f27266557ff9d5d2c08492e04135a6 168902 168902 - Merge: c7e18beb3c 58332894c0 169177 169177 + Merge: c7e18beb3 58332894c 168903 169178 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 168904 169179 Date: Mon Nov 5 19:08:36 2007 -0500 168905 169180 ··· 168927 169202 xselinux: Register SELinux extension protocol names. 168928 169203 168929 169204 commit 632c33c5c18b3e091c4fce98280af4d583e99640 168930 168930 - Merge: 4113f040c5 dda10c9066 169205 169205 + Merge: 4113f040c dda10c906 168931 169206 Author: Dodji Seketeli <dodji@openedhand.com> 168932 169207 Date: Mon Nov 5 17:52:33 2007 +0100 168933 169208 ··· 169597 169872 xselinux: Label the default device directly with the process context. 169598 169873 169599 169874 commit b633d54b94d746d26e13014634d9f63bbb7e8f7d 169600 169600 - Merge: 4b05f19cb9 48ca5961ca 169875 169875 + Merge: 4b05f19cb 48ca5961c 169601 169876 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 169602 169877 Date: Thu Oct 25 12:19:30 2007 -0400 169603 169878 ··· 169799 170074 they should be. 169800 170075 169801 170076 commit a3a95d3475dc91ed2e8a55bf484a6b3f2b5ac32a 169802 169802 - Merge: a358b87f45 7e1cada6c6 170077 170077 + Merge: a358b87f4 7e1cada6c 169803 170078 Author: Eric Anholt <eric@anholt.net> 169804 170079 Date: Fri Oct 19 15:44:17 2007 -0700 169805 170080 ··· 170005 170280 Need to merge so this type of thing stops happening. 170006 170281 170007 170282 commit c3f7b862550fa8f46633162f83db8c27e46fc672 170008 170008 - Merge: af4dde0ac1 feac075952 170283 170283 + Merge: af4dde0ac feac07595 170009 170284 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 170010 170285 Date: Wed Oct 17 15:00:54 2007 -0400 170011 170286 ··· 170585 170860 Fix GLX byteswapping. 170586 170861 170587 170862 commit 927757e1028f45f7fd94b9a2ab35567e0f34b2a8 170588 170588 - Merge: ccda4b66bd 17ffc34ad5 170863 170863 + Merge: ccda4b66b 17ffc34ad 170589 170864 Author: Kristian Høgsberg <krh@redhat.com> 170590 170865 Date: Fri Oct 12 19:28:39 2007 -0400 170591 170866 ··· 170865 171140 regardless of who is the pairing client. 170866 171141 170867 171142 commit 4611f9568cdadf9c00f4b7ca4c77c8c6f07e94f8 170868 170868 - Merge: ab11bad547 3549a12823 171143 171143 + Merge: ab11bad54 3549a1282 170869 171144 Author: Dodji Seketeli <dodji@openedhand.com> 170870 171145 Date: Thu Oct 4 13:07:50 2007 +0200 170871 171146 ··· 170938 171213 it for them completely. 170939 171214 170940 171215 commit 604ebb5a6de372e6a8a96e0ee997db7929126860 170941 170941 - Merge: 1365aeff54 4ba76a7e2b 171216 171216 + Merge: 1365aeff5 4ba76a7e2 170942 171217 Author: Dodji Seketeli <dodji@openedhand.com> 170943 171218 Date: Wed Oct 3 16:13:16 2007 +0200 170944 171219 ··· 171076 171351 Also fix incorrect library inclusion by kdrive which broke the build. 171077 171352 171078 171353 commit 439edc768eea17667846ce573c843b8377e0dfb4 171079 171079 - Merge: c8ccf469dc 93ae6fe18c 171354 171354 + Merge: c8ccf469d 93ae6fe18 171080 171355 Author: Eric Anholt <eric@anholt.net> 171081 171356 Date: Tue Oct 2 12:14:04 2007 -0700 171082 171357 ··· 172009 172284 This is hopefully better than hardcodey calling CoreProcessPointerEvent. 172010 172285 172011 172286 commit 27612748e0ec20f3a23839f0a12e39f598dd722c 172012 172012 - Merge: b61461425e 3b114f2603 172287 172287 + Merge: b61461425 3b114f260 172013 172288 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 172014 172289 Date: Wed Sep 26 07:47:29 2007 -0400 172015 172290 ··· 172430 172705 hey -- you have to start somewhere. ;) 172431 172706 172432 172707 commit 97c150b61bbe436453b05d3c07cd2173870aac40 172433 172433 - Merge: 57907e0943 547ad2125e 172708 172708 + Merge: 57907e094 547ad2125 172434 172709 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 172435 172710 Date: Wed Sep 19 07:25:55 2007 -0400 172436 172711 ··· 172555 172830 Initialize output->pendingProperties. 172556 172831 172557 172832 commit b9f7aeb20015290a8acf938a11bf9272bf3527cf 172558 172558 - Merge: e4d11e58ce 06d27f8045 172833 172833 + Merge: e4d11e58c 06d27f804 172559 172834 Author: Eric Anholt <eric@anholt.net> 172560 172835 Date: Thu Sep 13 00:15:45 2007 +0000 172561 172836 ··· 172969 173244 broken uses. 172970 173245 172971 173246 commit e332335241af28ef0ab66b102d0cbc4e5c73ac68 172972 172972 - Merge: 7381e9149e accd71bda6 173247 173247 + Merge: 7381e9149 accd71bda 172973 173248 Author: Ben Byer <bbyer@bbyer.apple.com> 172974 173249 Date: Wed Sep 5 15:51:23 2007 -0700 172975 173250 ··· 173014 173289 so it doesn't make sense to require it when building on OSX/Darwin. 173015 173290 173016 173291 commit ff01e44e33fd072958fb0157dae072f1b1c88944 173017 173017 - Merge: 8ba8c16af7 47300ed2be 173292 173292 + Merge: 8ba8c16af 47300ed2b 173018 173293 Author: Ben Byer <bbyer@bbyer.apple.com> 173019 173294 Date: Wed Sep 5 13:56:08 2007 -0700 173020 173295 ··· 173164 173439 Revert part of 529acb175440969af9d7fa38aab8d7dea0dc2661 because libtool is smart. 173165 173440 173166 173441 commit bf5948518763b5e21eff806a0a9abc5f7757fa10 173167 173167 - Merge: 4062db4020 735da3dcd0 173442 173442 + Merge: 4062db402 735da3dcd 173168 173443 Author: Matthieu Herrb <matthieu@bluenote.herrb.com> 173169 173444 Date: Tue Sep 4 22:40:31 2007 +0200 173170 173445 ··· 173480 173755 FontRec privates. 173481 173756 173482 173757 commit 85547073265ae9bc4ae3af920a6d3214fd1ca0c5 173483 173483 - Merge: 860a09cfb8 7d54399cfd 173758 173758 + Merge: 860a09cfb 7d54399cf 173484 173759 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 173485 173760 Date: Tue Aug 28 07:25:21 2007 -0400 173486 173761 ··· 173580 173855 Bump video driver ABI for pci-rework. 173581 173856 173582 173857 commit 91f358336f77c0e4f577be65cca977d17298e36c 173583 173583 - Merge: b9a806f0b3 8b6b40b727 173858 173858 + Merge: b9a806f0b 8b6b40b72 173584 173859 Author: Ian Romanick <idr@us.ibm.com> 173585 173860 Date: Fri Aug 24 15:04:21 2007 -0700 173586 173861 ··· 173634 173909 case. 173635 173910 173636 173911 commit 8b6b40b7271acd81a9548f502c18f46f3b640640 173637 173637 - Merge: ab7a6d860d 3305d17195 173912 173912 + Merge: ab7a6d860 3305d1719 173638 173913 Author: Ian Romanick <idr@us.ibm.com> 173639 173914 Date: Thu Aug 23 18:19:17 2007 -0700 173640 173915 ··· 173771 174046 Fix <pixman.h> include to <pixman/pixman.h> 173772 174047 173773 174048 commit b6a7c0112c42a3287e53647c38b2c0c5bf8fefa0 173774 173774 - Merge: 53941c8e68 6ef4ecd826 174049 174049 + Merge: 53941c8e6 6ef4ecd82 173775 174050 Author: Søren Sandmann Pedersen <sandmann@redhat.com> 173776 174051 Date: Tue Aug 21 14:26:34 2007 -0400 173777 174052 ··· 174083 174358 current interface. 174084 174359 174085 174360 commit f367285fd5825e0adc271982a529c9904ad65c89 174086 174086 - Merge: b1272eefd9 ff4bd3addb 174361 174361 + Merge: b1272eefd ff4bd3add 174087 174362 Author: Peter Hutterer <peter@cs.unisa.edu.au> 174088 174363 Date: Sun Aug 12 15:31:10 2007 +0930 174089 174364 ··· 174458 174733 ProcRenderAddGlyphs: Convert while loops to for loops where more natural 174459 174734 174460 174735 commit e34fcd2bf42dbd72ab6ce2df80f2dcaa13416e74 174461 174461 - Merge: 32c0dcc8c0 f3955c0a02 174736 174736 + Merge: 32c0dcc8c f3955c0a0 174462 174737 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 174463 174738 Date: Thu Aug 2 14:27:03 2007 -0400 174464 174739 ··· 175766 176041 can't actually occur when swapped out. 175767 176042 175768 176043 commit 1f97a7647606226cde61d6ad7a94f2b0b571a06c 175769 175769 - Merge: 5dee64fc99 2e7fef7d08 176044 176044 + Merge: 5dee64fc9 2e7fef7d0 175770 176045 Author: Peter Hutterer <peter@cs.unisa.edu.au> 175771 176046 Date: Tue Jun 19 17:20:52 2007 +0930 175772 176047 ··· 175808 176083 device to interact, so this seems like a reasonable solution. 175809 176084 175810 176085 commit ab7a6d860d4a275a810a64b1ba7b13726ed10575 175811 175811 - Merge: e9130b8bac 2e7fef7d08 176086 176086 + Merge: e9130b8ba 2e7fef7d0 175812 176087 Author: Ian Romanick <idr@us.ibm.com> 175813 176088 Date: Mon Jun 18 16:51:13 2007 -0700 175814 176089 ··· 175890 176165 Delete fbBltmmx(). 175891 176166 175892 176167 commit e2a720c9a17dc860ee0a858c2b21fd71e86cdcd0 175893 175893 - Merge: 878cac71aa 3f9adb18f1 176168 176168 + Merge: 878cac71a 3f9adb18f 175894 176169 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 175895 176170 Date: Mon Jun 11 15:29:11 2007 -0400 175896 176171 ··· 176214 176489 Remove wscons keyboard handling stuff that doesn't belong there anymore. 176215 176490 176216 176491 commit 60de6c7ef9bdcee043f63e8e0d493e6feba6a9d0 176217 176217 - Merge: 3a6549a163 2f13b7c113 176492 176492 + Merge: 3a6549a16 2f13b7c11 176218 176493 Author: Matthieu Herrb <matthieu@deville.herrb.com> 176219 176494 Date: Tue May 29 12:14:49 2007 -0600 176220 176495 ··· 176387 176662 Add missing offsets for window coordinates - reported by Colin Harrison 176388 176663 176389 176664 commit 2a4aa63a23ddd816b647b851a01865861827a7eb 176390 176390 - Merge: 9cee4ec5e6 cc648e609d 176665 176665 + Merge: 9cee4ec5e cc648e609 176391 176666 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 176392 176667 Date: Tue May 22 14:50:26 2007 -0400 176393 176668 ··· 176938 177213 fix __glXErrorCallBack() proto 176939 177214 176940 177215 commit 6b33459bf5aac23c3ecc7002d091c02f327d907a 176941 176941 - Merge: 18252a515d 3c91a993e8 177216 177216 + Merge: 18252a515 3c91a993e 176942 177217 Author: Brian <brian@yutani.localnet.net> 176943 177218 Date: Mon Apr 30 10:26:19 2007 -0600 176944 177219 ··· 177126 177401 are both 0. 177127 177402 177128 177403 commit f28eea0647f007c2e2415ecc6fceef46201faad4 177129 177129 - Merge: 339b73e710 ae04f2cb0a 177404 177404 + Merge: 339b73e71 ae04f2cb0 177130 177405 Author: Peter Hutterer <peter@cs.unisa.edu.au> 177131 177406 Date: Fri Apr 27 16:34:36 2007 +0930 177132 177407 ··· 177657 177932 security: remove debugging code. 177658 177933 177659 177934 commit 1f06d32ef58749d0f0c062193d237ee98f60e90f 177660 177660 - Merge: cf962a849d fc162c6cfa 177935 177935 + Merge: cf962a849 fc162c6cf 177661 177936 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 177662 177937 Date: Tue Apr 17 12:10:22 2007 -0400 177663 177938 ··· 177828 178103 This workaround is obsolete with 33a5d9605e3e282f6aa1921d7321a2a12ef02c42 177829 178104 177830 178105 commit d4dad6f84f82a4ade5005c3aa93511c1295875b8 177831 177831 - Merge: f1f8b562aa 33a5d9605e 178106 178106 + Merge: f1f8b562a 33a5d9605 177832 178107 Author: Peter Hutterer <peter@cs.unisa.edu.au> 177833 178108 Date: Thu Apr 12 11:11:03 2007 +0930 177834 178109 ··· 178082 178357 GLcore: fix after moving xf86glx_util.[hc] to Mesa. 178083 178358 178084 178359 commit cf962a849db2b259ca558c6265ea7e3328a4d312 178085 178085 - Merge: 5ad562565a 5a804f2e97 178360 178360 + Merge: 5ad562565 5a804f2e9 178086 178361 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 178087 178362 Date: Thu Apr 5 14:41:39 2007 -0400 178088 178363 ··· 178228 178503 about setting the XFree86Server symbol. 178229 178504 178230 178505 commit 1cc8db72816cd079f30255046e10043c350bf683 178231 178231 - Merge: 645d87cf8e a39f297ada 178506 178506 + Merge: 645d87cf8 a39f297ad 178232 178507 Author: Matthieu Herrb <matthieu@roadrock.(none)> 178233 178508 Date: Tue Apr 3 16:04:45 2007 +0200 178234 178509 ··· 178247 178522 Delete all grabs from all devices when deleting a window. 178248 178523 178249 178524 commit 5f382c9c7fbda6eccf8e76c28a90b55ff2f0aef3 178250 178250 - Merge: 9b0b340668 f09ee168e2 178525 178525 + Merge: 9b0b34066 f09ee168e 178251 178526 Author: Peter Hutterer <peter@cs.unisa.edu.au> 178252 178527 Date: Tue Apr 3 15:07:18 2007 +0930 178253 178528 ··· 178367 178642 formatting fixes 178368 178643 178369 178644 commit e8777a91f37d828b9df839bf3d9cf2f954bdddb0 178370 178370 - Merge: a12054757d 96ce17aa94 178645 178645 + Merge: a12054757 96ce17aa9 178371 178646 Author: Peter Hutterer <peter@cs.unisa.edu.au> 178372 178647 Date: Mon Apr 2 15:36:26 2007 +0930 178373 178648 ··· 178432 178707 values of 1280 (my screen width). 178433 178708 178434 178709 commit e9130b8bac73a0843d5ff6b2216eccfb3e094a48 178435 178435 - Merge: 2c6d471088 92e8cdbd32 178710 178710 + Merge: 2c6d47108 92e8cdbd3 178436 178711 Author: Ian Romanick <idr@us.ibm.com> 178437 178712 Date: Fri Mar 30 13:39:15 2007 -0700 178438 178713 ··· 178569 178844 xace: provide creation-time resource hook call in CreateWindow(). 178570 178845 178571 178846 commit 99b220969f2f8ba829bc8294b27ca90fd9311be4 178572 178572 - Merge: 728ad64d97 82a8b99a6c 178847 178847 + Merge: 728ad64d9 82a8b99a6 178573 178848 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 178574 178849 Date: Wed Mar 28 12:54:04 2007 -0400 178575 178850 ··· 178582 178857 Refuse to create tiny modes from EDID detailed timing. 178583 178858 178584 178859 commit 2c6d47108880584f1221ff86c6c8947627f9f607 178585 178585 - Merge: c4fe1bcce1 8522044635 178860 178860 + Merge: c4fe1bcce 852204463 178586 178861 Author: Ian Romanick <idr@us.ibm.com> 178587 178862 Date: Wed Mar 28 08:08:04 2007 -0700 178588 178863 ··· 178652 178927 Fix indentation of fakexa help text. 178653 178928 178654 178929 commit 728ad64d979fd9e5cca28e8c15118c18d707c431 178655 178655 - Merge: 0331c6a8fc 6a0bed16e8 178930 178930 + Merge: 0331c6a8f 6a0bed16e 178656 178931 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 178657 178932 Date: Tue Mar 27 13:16:40 2007 -0400 178658 178933 ··· 178689 178964 Update xorg.conf manpage for new RandR 1.2 monitor options. 178690 178965 178691 178966 commit 0331c6a8fcba1dc27ef45aaf5f694799d0085413 178692 178692 - Merge: 84a066cc88 f7c5aa0dc0 178967 178967 + Merge: 84a066cc8 f7c5aa0dc 178693 178968 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 178694 178969 Date: Mon Mar 26 10:28:05 2007 -0400 178695 178970 ··· 179054 179329 by the evdev driver). 179055 179330 179056 179331 commit 015d728bcde5b16a72a976579755421e3023626b 179057 179057 - Merge: 65b0eb60b0 b167583fe2 179332 179332 + Merge: 65b0eb60b b167583fe 179058 179333 Author: Peter Hutterer <peter@cs.unisa.edu.au> 179059 179334 Date: Mon Mar 19 09:42:56 2007 +1030 179060 179335 ··· 179361 179636 devPrivates rework: move reset functions into a single call. 179362 179637 179363 179638 commit bb111291d854b4329e47367ce3c67e8a2785e6e9 179364 179364 - Merge: 74175e0af7 e9bfb2b3d7 179639 179639 + Merge: 74175e0af e9bfb2b3d 179365 179640 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 179366 179641 Date: Wed Mar 7 09:03:46 2007 -0500 179367 179642 ··· 179433 179708 updated todo list 179434 179709 179435 179710 commit 81d581e655fc989da3be4256b83849a63b8607b7 179436 179436 - Merge: a05ffca8dd d5aba03fef 179711 179711 + Merge: a05ffca8d d5aba03fe 179437 179712 Author: Ben Byer <bbyer@bbyer.(none)> 179438 179713 Date: Tue Mar 6 10:37:29 2007 -0800 179439 179714 ··· 179464 179739 moved new event-handling code from X11Application.m to darwinEvents.c in preparation for making all Darwin servers use it 179465 179740 179466 179741 commit 0ccd1443fd6db397b42e5b99ce733ce1316c785e 179467 179467 - Merge: ec1ef8a56d 9b6bb06f13 179742 179742 + Merge: ec1ef8a56 9b6bb06f1 179468 179743 Author: Ben Byer <bbyer@bbyer.(none)> 179469 179744 Date: Tue Mar 6 01:04:50 2007 -0800 179470 179745 ··· 179539 179814 devPrivates rework: remove some debugging code from dixFreePrivates. 179540 179815 179541 179816 commit 23fc429aad5b2721911862617772c314e1036bb0 179542 179542 - Merge: e684824709 fe7b8f4237 179817 179817 + Merge: e68482470 fe7b8f423 179543 179818 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 179544 179819 Date: Mon Mar 5 12:18:54 2007 -0500 179545 179820 ··· 179585 179860 modes: add commit/prepare hooks 179586 179861 179587 179862 commit 1f0075786fedde538a95e2f39681052e25021d88 179588 179588 - Merge: 57aa5e908d 12175b668a 179863 179863 + Merge: 57aa5e908 12175b668 179589 179864 Author: Peter Hutterer <peter@cs.unisa.edu.au> 179590 179865 Date: Mon Mar 5 12:37:17 2007 +1030 179591 179866 ··· 179786 180061 between coordinates stored in device and coordinates sent by the event. 179787 180062 179788 180063 commit d9bcb22d199e8444b9762a35754e04d327dd5915 179789 179789 - Merge: 272d9341d0 c16343ac2c 180064 180064 + Merge: 272d9341d c16343ac2 179790 180065 Author: Ben Byer <bbyer@bbyer.apple.com> 179791 180066 Date: Tue Feb 27 16:28:20 2007 -0800 179792 180067 ··· 180211 180486 http://xorg.freedesktop.org/wiki/XDC2007Notes#head-2719037a1905516c45cf74f0e155c8703221e446 180212 180487 180213 180488 commit f452507ca9209598401d15da0039aaa4e1fed1a3 180214 180214 - Merge: 04632835b7 811675733e 180489 180489 + Merge: 04632835b 811675733 180215 180490 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 180216 180491 Date: Thu Feb 15 09:47:20 2007 -0500 180217 180492 180218 180493 Merge branch 'master' into my-XACE-SELINUX 180219 180494 180220 180495 commit 04632835b7402456fdcf6c8fa01970cd2804e27c 180221 180221 - Merge: 88f89b9ac1 9ecf79ca01 180496 180496 + Merge: 88f89b9ac 9ecf79ca0 180222 180497 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 180223 180498 Date: Thu Feb 15 09:27:05 2007 -0500 180224 180499 ··· 180266 180541 fix: WarpCursor needs to send MotionNotify. 180267 180542 180268 180543 commit c4fe1bcce1c1e4822e688959b331b47a051d6e0a 180269 180269 - Merge: e540d572c5 d570ff7c81 180544 180544 + Merge: e540d572c d570ff7c8 180270 180545 Author: Ian Romanick <idr@us.ibm.com> 180271 180546 Date: Wed Feb 14 15:39:52 2007 -0800 180272 180547 ··· 180330 180605 Remove spurious LIBADD from xf4bpp 180331 180606 180332 180607 commit 16eb7254f861465f988ae3861ac3449c2c966062 180333 180333 - Merge: 3814862a86 c4b7e9d1c1 180608 180608 + Merge: 3814862a8 c4b7e9d1c 180334 180609 Author: Ian Romanick <idr@us.ibm.com> 180335 180610 Date: Fri Feb 9 12:38:49 2007 -0800 180336 180611 ··· 180509 180784 Typical results were failure to sync, and a black screen. 180510 180785 180511 180786 commit 3814862a869ee83d307eb01225d5949039f435d8 180512 180512 - Merge: a216de9b7f 31f2d4a57e 180787 180787 + Merge: a216de9b7 31f2d4a57 180513 180788 Author: Ian Romanick <idr@us.ibm.com> 180514 180789 Date: Mon Jan 29 15:14:31 2007 -0800 180515 180790 ··· 180550 180825 mi: Fix cursor rendering issues. 180551 180826 180552 180827 commit 15a81b6325d359990017b8e9f17ce18a7eff1354 180553 180553 - Merge: 3759254c09 cc3d66d4a5 180828 180828 + Merge: 3759254c0 cc3d66d4a 180554 180829 Author: Peter Hutterer <peter@cs.unisa.edu.au> 180555 180830 Date: Sun Jan 28 17:18:57 2007 +1030 180556 180831 ··· 180563 180838 o fix minor error in comment for GetPointerEvents() 180564 180839 180565 180840 commit 3759254c0967ae83bdcbf097d9e8a58733c8e6f9 180566 180566 - Merge: ba547d4f6a ca5ebe3971 180841 180841 + Merge: ba547d4f6 ca5ebe397 180567 180842 Author: Peter Hutterer <peter@cs.unisa.edu.au> 180568 180843 Date: Sun Jan 28 17:05:55 2007 +1030 180569 180844 ··· 180582 180857 Xorg #9692 180583 180858 180584 180859 commit a216de9b7ff55e2b73c487d037f248f00bd2e63b 180585 180585 - Merge: 24506ea65b cf7ca9d09c 180860 180860 + Merge: 24506ea65 cf7ca9d09 180586 180861 Author: Ian Romanick <idr@us.ibm.com> 180587 180862 Date: Thu Jan 25 10:17:32 2007 -0800 180588 180863 ··· 180617 180892 read_legcay_BIOS, and delete all remnants of it from all other places. 180618 180893 180619 180894 commit fdb3a0798f0d17e72ec7293d59a7a81b5ffdf95b 180620 180620 - Merge: 39b51e1bfc a53586eebc 180895 180895 + Merge: 39b51e1bf a53586eeb 180621 180896 Author: Ian Romanick <idr@us.ibm.com> 180622 180897 Date: Wed Jan 24 14:49:39 2007 -0800 180623 180898 ··· 180645 180920 Make Xinearama screen information reflect CRTC rotation. 180646 180921 180647 180922 commit 39b51e1bfc4924fc3bda4342ef9c6c0125d9f4fa 180648 180648 - Merge: 637b19b3ee 788cfce911 180923 180923 + Merge: 637b19b3e 788cfce91 180649 180924 Author: Ian Romanick <idr@us.ibm.com> 180650 180925 Date: Tue Jan 23 13:25:56 2007 -0800 180651 180926 ··· 180687 180962 ARCH_PCI_OS_INIT mechanism useless. Remove it. 180688 180963 180689 180964 commit 7dfb3cea913b02a6b36c308d1330bd40abe6b41f 180690 180690 - Merge: c279d5fdc5 2dc866252c 180965 180965 + Merge: c279d5fdc 2dc866252 180691 180966 Author: Ian Romanick <idr@us.ibm.com> 180692 180967 Date: Mon Jan 22 08:44:36 2007 -0800 180693 180968 ··· 180725 181000 -ardelay and -arinterval, respectively. 180726 181001 180727 181002 commit c279d5fdc53612a90f33fafe9e9c59ced008dd51 180728 180728 - Merge: 88f248e671 14d6a9b327 181003 181003 + Merge: 88f248e67 14d6a9b32 180729 181004 Author: Ian Romanick <idr@us.ibm.com> 180730 181005 Date: Fri Jan 19 12:59:54 2007 -0800 180731 181006 ··· 181018 181293 Track rename of DamagePost -> DamageAdd. 181019 181294 181020 181295 commit da09964a931cc64d05ab571bf545fdad35a6d395 181021 181021 - Merge: e1f73d2208 e3aa6ad201 181296 181296 + Merge: e1f73d220 e3aa6ad20 181022 181297 Author: Ian Romanick <idr@us.ibm.com> 181023 181298 Date: Tue Jan 9 15:27:34 2007 -0800 181024 181299 ··· 181103 181378 Incorporate new byte-order related configure changes. 181104 181379 181105 181380 commit 8dd5771a1b91c331860b667fb18e484452000aad 181106 181106 - Merge: 45aa26ccb4 7d2ec92170 181381 181381 + Merge: 45aa26ccb 7d2ec9217 181107 181382 Author: Ian Romanick <idr@us.ibm.com> 181108 181383 Date: Thu Jan 4 15:01:38 2007 -0800 181109 181384 ··· 181269 181544 Export exaMove{In,Out}Pixmap(). 181270 181545 181271 181546 commit 683ca3f7afaf15fd3ca7918f6175b5a9e4a6f05b 181272 181272 - Merge: 05f915050c 9563b2eea2 181547 181547 + Merge: 05f915050 9563b2eea 181273 181548 Author: Eric Anholt <eric@anholt.net> 181274 181549 Date: Wed Dec 27 16:11:31 2006 -0800 181275 181550 ··· 181310 181585 Make sure we're not copying sym_interpret across from an empty source. 181311 181586 181312 181587 commit 43a4376bd72ef1b6486cddb60ad57b2d6169292a 181313 181313 - Merge: 4b1c9ac3d1 d9e079d2a3 181588 181588 + Merge: 4b1c9ac3d d9e079d2a 181314 181589 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 181315 181590 Date: Fri Dec 22 13:53:55 2006 -0500 181316 181591 ··· 181372 181647 xorg.conf man page should say "XFree86-DGA", not "Xorg-DGA" 181373 181648 181374 181649 commit a81dbaae0597492f0245080c6f5af7158e05e2d0 181375 181375 - Merge: fb6d676de5 d442998e39 181650 181650 + Merge: fb6d676de d442998e3 181376 181651 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 181377 181652 Date: Tue Dec 19 16:11:19 2006 -0500 181378 181653 ··· 181412 181687 This affects drivers with no UploadToScreen or UploadToScreen failures. 181413 181688 181414 181689 commit 4334860e69e7d5b156082bd05c7a86708e5bad4c 181415 181415 - Merge: 7e4717683d fdcc22ca17 181690 181690 + Merge: 7e4717683 fdcc22ca1 181416 181691 Author: Michel Dänzer <michel@tungstengraphics.com> 181417 181692 Date: Tue Dec 19 16:29:26 2006 +0100 181418 181693 ··· 181447 181722 See https://bugs.freedesktop.org/show_bug.cgi?id=6772 . 181448 181723 181449 181724 commit ca5ebe3971d8ebcfed00c5ebcd026cdd0ce0c6ba 181450 181450 - Merge: 4d07b50372 1b029fd896 181725 181725 + Merge: 4d07b5037 1b029fd89 181451 181726 Author: Peter Hutterer <peter@cs.unisa.edu.au> 181452 181727 Date: Tue Dec 19 10:51:01 2006 +1030 181453 181728 181454 181729 Merge branch 'master' of git://anongit.freedesktop.org/git/xorg/xserver 181455 181730 181456 181731 commit 2d0a63126b3d3a17005b7e122617ee0c5f44a55b 181457 181457 - Merge: d8b5394eda 1b029fd896 181732 181732 + Merge: d8b5394ed 1b029fd89 181458 181733 Author: Peter Hutterer <peter@cs.unisa.edu.au> 181459 181734 Date: Tue Dec 19 10:31:40 2006 +1030 181460 181735 ··· 181681 181956 Split AssignClientState() into two routines, new routine is server-specific. 181682 181957 181683 181958 commit 62e7722ebd8d341a23eb56cb330eeb00e6a975a6 181684 181684 - Merge: e124806994 f3c60900e5 181959 181959 + Merge: e12480699 f3c60900e 181685 181960 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 181686 181961 Date: Tue Dec 12 13:54:33 2006 -0500 181687 181962 ··· 181785 182060 Accept EDID > 1.3 but < 2.0 if we find it, assume it's compatible. 181786 182061 181787 182062 commit e1f73d220873fa091695e46b7fcd008663a95a6f 181788 181788 - Merge: 27d682fa03 d56249a15e 182063 182063 + Merge: 27d682fa0 d56249a15 181789 182064 Author: Ian Romanick <idr@us.ibm.com> 181790 182065 Date: Fri Dec 8 17:24:15 2006 -0800 181791 182066 ··· 181805 182080 hw/xfree86/utils/scanpci/Makefile.am 181806 182081 181807 182082 commit d56249a15ead51ad4d2117d5538ada24af05b693 181808 181808 - Merge: f1f8df1889 ec84f72d07 182083 182083 + Merge: f1f8df188 ec84f72d0 181809 182084 Author: Jeremy C. Reed <reed@glacier.reedmedia.net> 181810 182085 Date: Fri Dec 8 15:52:37 2006 -0600 181811 182086 ··· 181967 182242 Ironing some glitches caused by the merge 181968 182243 181969 182244 commit 3c8f166022a2d19af14eb670fa382503ba1451cd 181970 181970 - Merge: 2a511492f9 f9f7d7f3be 182245 182245 + Merge: 2a511492f f9f7d7f3b 181971 182246 Author: Peter Hutterer <peter@cs.unisa.edu.au> 181972 182247 Date: Tue Dec 5 18:28:33 2006 +1030 181973 182248 ··· 182048 182323 DeliverDeviceEvents() caters for MPX devices. 182049 182324 182050 182325 commit ccd804c6c01cdfffe938fa5336be9b5668a6f0c0 182051 182051 - Merge: 9423ac134a 82912ad770 182326 182326 + Merge: 9423ac134 82912ad77 182052 182327 Author: Drew Parsons <drew@pug.localdomain> 182053 182328 Date: Fri Dec 1 15:21:57 2006 +1100 182054 182329 ··· 182087 182362 Add required root window context to config file. 182088 182363 182089 182364 commit 143558500a89a5c887c75c03798bae68c953cac9 182090 182090 - Merge: e3d3d29db5 ee9bdd3f4a 182365 182365 + Merge: e3d3d29db ee9bdd3f4 182091 182366 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 182092 182367 Date: Wed Nov 29 20:41:41 2006 -0500 182093 182368 ··· 182221 182496 Move mode handling helpers from ddcProperty.c to xf86Mode.c. 182222 182497 182223 182498 commit b4b0d901d98371a8aa7b17d195e18e83e2a6a618 182224 182224 - Merge: 64de3baf85 d6cd0313c7 182499 182499 + Merge: 64de3baf8 d6cd0313c 182225 182500 Author: Eric Anholt <eric@anholt.net> 182226 182501 Date: Mon Nov 27 15:43:15 2006 -0800 182227 182502 ··· 182440 182715 bugfix in mipointer, semicolon after preprocessor statement 182441 182716 182442 182717 commit ca2874b273232d9f51881b1cd754ed6847bfaf47 182443 182443 - Merge: c9a5f9d391 e2f6dacc73 182718 182718 + Merge: c9a5f9d39 e2f6dacc7 182444 182719 Author: Alan Hourihane <alanh@fairlite.demon.co.uk> 182445 182720 Date: Sat Nov 18 19:56:32 2006 +0000 182446 182721 ··· 182613 182888 Bug #9023: Only check mice for "mouse" or "void" if identifier is != NULL. 182614 182889 182615 182890 commit a724b7f1302ba7a59f140b521f13d2ddf0fcf9bf 182616 182616 - Merge: 6facd958c2 f80a8ae6e6 182891 182891 + Merge: 6facd958c f80a8ae6e 182617 182892 Author: Jeremy C. Reed <reed@glacier.reedmedia.net> 182618 182893 Date: Mon Nov 13 20:32:26 2006 -0600 182619 182894 ··· 182937 183212 A couple more cases of error message before freeing strings. 182938 183213 182939 183214 commit 05f1c302460a14c8fa9a943a12d69adcd3c30d58 182940 182940 - Merge: 3e7e0e3509 46af6d1e95 183215 183215 + Merge: 3e7e0e350 46af6d1e9 182941 183216 Author: Adam Jackson <ajax@benzedrine.nwnk.net> 182942 183217 Date: Tue Nov 7 18:42:54 2006 -0500 182943 183218 ··· 182983 183258 getevents.c 182984 183259 182985 183260 commit c20d3bf7533da0bf26beaf7d8c359d18edbd70e8 182986 182986 - Merge: 028bbdc041 3d39c02fe6 183261 183261 + Merge: 028bbdc04 3d39c02fe 182987 183262 Author: Keith Packard <keithp@neko.keithp.com> 182988 183263 Date: Tue Nov 7 01:21:28 2006 -0800 182989 183264 ··· 183022 183297 Fix typo in Xvesa: incorrect reporting of DAC capabilities. 183023 183298 183024 183299 commit 028bbdc0417173803695808ba9f48498519273a3 183025 183025 - Merge: 50504c68e1 8deaaa312a 183300 183300 + Merge: 50504c68e 8deaaa312 183026 183301 Author: Keith Packard <keithp@neko.keithp.com> 183027 183302 Date: Sat Nov 4 17:46:26 2006 -0800 183028 183303 183029 183304 Merge master back to randr-1.2 183030 183305 183031 183306 commit 50504c68e1d407232cf83465981b235e542ef31f 183032 183032 - Merge: 8b87ce1974 cde8806c29 183307 183307 + Merge: 8b87ce197 cde8806c2 183033 183308 Author: Keith Packard <keithp@neko.keithp.com> 183034 183309 Date: Sat Nov 4 17:43:19 2006 -0800 183035 183310 ··· 183109 183384 and 1024x768@75 modes. 183110 183385 183111 183386 commit 22ee2e4e1f1d9fd9ca9f25c9bf25370034b771d4 183112 183112 - Merge: 49a26681b2 bd0c829654 183387 183387 + Merge: 49a26681b bd0c82965 183113 183388 Author: Alan Coopersmith <alan.coopersmith@sun.com> 183114 183389 Date: Fri Nov 3 12:54:56 2006 -0800 183115 183390 ··· 183222 183497 Build with -D_PC on ix86 only. 183223 183498 183224 183499 commit 543b397277d1f03b8091e44812010abcd5d80102 183225 183225 - Merge: 4056e6e79a 645d057620 183500 183500 + Merge: 4056e6e79 645d05762 183226 183501 Author: Keith Packard <keithp@neko.keithp.com> 183227 183502 Date: Thu Nov 2 19:00:35 2006 -0800 183228 183503 ··· 183293 183568 bump to 1.2.99.0 183294 183569 183295 183570 commit 18c246a13b887b865de6a17e6cd1c259b9bc383d 183296 183296 - Merge: 794f2e7291 4843d823f4 183571 183571 + Merge: 794f2e729 4843d823f 183297 183572 Author: Daniel Stone <daniel@fooishbar.org> 183298 183573 Date: Thu Nov 2 03:21:37 2006 +0200 183299 183574 183300 183575 Merge branch 'input-hotplug' 183301 183576 183302 183577 commit 4843d823f4d38d8bd468ce3a8feddbff229ed416 183303 183303 - Merge: ba9f5138fc a7b944f0d9 183578 183578 + Merge: ba9f5138f a7b944f0d 183304 183579 Author: Daniel Stone <daniel@fooishbar.org> 183305 183580 Date: Thu Nov 2 03:18:13 2006 +0200 183306 183581 ··· 183316 183591 config file. 183317 183592 183318 183593 commit be291a6d9764cf29a7d9a8114d47d9f41ce856e9 183319 183319 - Merge: a2d6242106 6fdfd9dad9 183594 183594 + Merge: a2d624210 6fdfd9dad 183320 183595 Author: Daniel Stone <daniel@fooishbar.org> 183321 183596 Date: Thu Nov 2 03:15:25 2006 +0200 183322 183597 ··· 183433 183708 kill GNU-make'ism. 183434 183709 183435 183710 commit 0107320fac0913aae2cb169992e31c670b4bd2f7 183436 183436 - Merge: 06b6b971d0 a34446f5b3 183711 183711 + Merge: 06b6b971d a34446f5b 183437 183712 Author: Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> 183438 183713 Date: Sun Oct 29 15:23:35 2006 +0100 183439 183714 ··· 183504 183779 Import libdrm functions for the drm memory manager. 183505 183780 183506 183781 commit e3d3d29db5eef057b4e8294377c9c3147436bc2f 183507 183507 - Merge: 92387e99d0 004d00e668 183782 183782 + Merge: 92387e99d 004d00e66 183508 183783 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 183509 183784 Date: Thu Oct 26 20:21:16 2006 -0400 183510 183785 ··· 183555 183830 lnx_ia64.c. 183556 183831 183557 183832 commit 8c0556e7cb1de8c387ddd886a03a8f8afff1fd0e 183558 183558 - Merge: cdc8a4b7b2 004d00e668 183833 183833 + Merge: cdc8a4b7b 004d00e66 183559 183834 Author: Daniel Stone <daniel@fooishbar.org> 183560 183835 Date: Thu Oct 26 15:21:22 2006 +0300 183561 183836 ··· 183573 183848 The fallthrough to gettimeofday() is preserved. 183574 183849 183575 183850 commit cdc8a4b7b2f099b8860a54c5c9f488e6f7c4913a 183576 183576 - Merge: 3da918a16c d285833290 183851 183851 + Merge: 3da918a16 d28583329 183577 183852 Author: Daniel Stone <daniel@fooishbar.org> 183578 183853 Date: Thu Oct 26 00:28:30 2006 +0300 183579 183854 ··· 183614 183889 without pretending it's always on. 183615 183890 183616 183891 commit 59511974db843fa7e11133894cfc10c20fdaf60f 183617 183617 - Merge: 054f8cd267 598ac7a836 183892 183892 + Merge: 054f8cd26 598ac7a83 183618 183893 Author: Keith Packard <keithp@neko.keithp.com> 183619 183894 Date: Tue Oct 24 17:26:20 2006 -0700 183620 183895 183621 183896 Merge branch 'master' into randr-1.2 183622 183897 183623 183898 commit 598ac7a83698327b607084abaebcbd22f8d25fbb 183624 183624 - Merge: 828c34e83c 948a97b97e 183899 183899 + Merge: 828c34e83 948a97b97 183625 183900 Author: Keith Packard <keithp@neko.keithp.com> 183626 183901 Date: Tue Oct 24 17:23:12 2006 -0700 183627 183902 ··· 183720 183995 Fix from HEAD accidentally reverted during merge. 183721 183996 183722 183997 commit 8b909135664abb69ada522e8e39495d9eca717ac 183723 183723 - Merge: 21291d6ca7 948a97b97e 183998 183998 + Merge: 21291d6ca 948a97b97 183724 183999 Author: Ian Romanick <idr@us.ibm.com> 183725 184000 Date: Tue Oct 24 08:57:59 2006 -0700 183726 184001 ··· 183777 184052 Remove unused xf86CheckButton. 183778 184053 183779 184054 commit c5b5b046e86b159a9d32451308f38246cc4587f7 183780 183780 - Merge: fab1d37ecb 948a97b97e 184055 184055 + Merge: fab1d37ec 948a97b97 183781 184056 Author: Daniel Stone <daniel@fooishbar.org> 183782 184057 Date: Mon Oct 23 02:58:30 2006 +0300 183783 184058 ··· 183963 184238 Minor typos in Xserver man page. 183964 184239 183965 184240 commit e26a494f417c3c700636ee68892c3015b2e0f27a 183966 183966 - Merge: 736b0d5078 aeba855b07 184241 184241 + Merge: 736b0d507 aeba855b0 183967 184242 Author: Zephaniah E. Hull <warp@agamemnon.b5> 183968 184243 Date: Sat Oct 21 04:26:14 2006 -0400 183969 184244 ··· 184277 184552 Separate configuration from layout changes to send correct events. 184278 184553 184279 184554 commit 335b503c5e7041bb0c44611e496d1c46f554e630 184280 184280 - Merge: bd3d93be82 cf948b7b04 184555 184555 + Merge: bd3d93be8 cf948b7b0 184281 184556 Author: Daniel Stone <daniel@fooishbar.org> 184282 184557 Date: Fri Oct 13 18:10:45 2006 +0300 184283 184558 ··· 184291 184566 to avoid cursor movements signalling io. 184292 184567 184293 184568 commit 4b53a5e4b147ab748b28dffc1d330b7148d8efa6 184294 184294 - Merge: 23f6f08b7b 042d4a407d 184569 184569 + Merge: 23f6f08b7 042d4a407 184295 184570 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 184296 184571 Date: Wed Oct 11 20:50:31 2006 -0400 184297 184572 ··· 184505 184780 layer. 184506 184781 184507 184782 commit 4c342246300e06bdf5c9c62cc1d2f6aa57a524db 184508 184508 - Merge: 8382234a7f 49a70c8570 184783 184783 + Merge: 8382234a7 49a70c857 184509 184784 Author: Alan Coopersmith <alan.coopersmith@sun.com> 184510 184785 Date: Fri Oct 6 18:01:13 2006 -0700 184511 184786 ··· 184558 184833 Improve error handling, messages during initialization. 184559 184834 184560 184835 commit de63a469dcd0a8ae98554bca540ac0106cccf2a5 184561 184561 - Merge: 9c7440bdf5 8382234a7f 184836 184836 + Merge: 9c7440bdf 8382234a7 184562 184837 Author: Daniel Stone <daniel@fooishbar.org> 184563 184838 Date: Thu Oct 5 20:29:19 2006 +0300 184564 184839 184565 184840 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 184566 184841 184567 184842 commit b4659faf9b455b44ac8e691cc7a8fc00a967c80b 184568 184568 - Merge: c4f30c6353 8382234a7f 184843 184843 + Merge: c4f30c635 8382234a7 184569 184844 Author: Keith Packard <keithp@neko.keithp.com> 184570 184845 Date: Wed Oct 4 14:46:04 2006 -0700 184571 184846 ··· 184601 184876 Don't insert RCS tag into generated pci id header files 184602 184877 184603 184878 commit 75e0cc41b201b9ceb2615e7cec0dd5b4c136b343 184604 184604 - Merge: 6926776f0e 20c0ceedfb 184879 184879 + Merge: 6926776f0 20c0ceedf 184605 184880 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 184606 184881 Date: Tue Oct 3 13:58:03 2006 -0400 184607 184882 ··· 184635 184910 Use XkbCharToInt as that's what we're doing. 184636 184911 184637 184912 commit 3c98cebb6e954855528794fec46830f456cbdec1 184638 184638 - Merge: fa1ac94178 2cf1098436 184913 184913 + Merge: fa1ac9417 2cf109843 184639 184914 Author: Daniel Stone <daniel@fooishbar.org> 184640 184915 Date: Mon Oct 2 02:18:17 2006 +0300 184641 184916 ··· 184663 184938 if built with --enable-debug. 184664 184939 184665 184940 commit 20c0ceedfbce9ae5c70703900b52973917ac4cd0 184666 184666 - Merge: 49a70c8570 84eb2c0a06 184941 184941 + Merge: 49a70c857 84eb2c0a0 184667 184942 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 184668 184943 Date: Fri Sep 29 15:37:00 2006 -0400 184669 184944 184670 184945 Merge branch 'master' into my-XACE-modular 184671 184946 184672 184947 commit 518db35ca3f569e7cb95dbddeddb93f3691de498 184673 184673 - Merge: 5d99e05f05 84eb2c0a06 184948 184948 + Merge: 5d99e05f0 84eb2c0a0 184674 184949 Author: Daniel Stone <daniel@fooishbar.org> 184675 184950 Date: Fri Sep 29 00:35:21 2006 +0300 184676 184951 184677 184952 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 184678 184953 184679 184954 commit 5d99e05f05a42a82a9f02844df9bfebaa673759d 184680 184680 - Merge: ad631afcf3 5893375786 184955 184955 + Merge: ad631afcf 589337578 184681 184956 Author: Daniel Stone <daniel@fooishbar.org> 184682 184957 Date: Fri Sep 29 00:35:07 2006 +0300 184683 184958 ··· 184701 184976 Patch by Dan Nicholson. 184702 184977 184703 184978 commit 4bc5dc2854e33bf343cdea44a3c3b4c41f6f4145 184704 184704 - Merge: cf6e9687ff f9542e7495 184979 184979 + Merge: cf6e9687f f9542e749 184705 184980 Author: Aaron Plattner <aplattner@nvidia.com> 184706 184981 Date: Thu Sep 28 13:27:13 2006 -0700 184707 184982 ··· 184741 185016 Add wrapper for new ioctl to update drawable information in the DRM. 184742 185017 184743 185018 commit ad321fad4b9ab3a2c70cfff37ca6c8faaa5cce9c 184744 184744 - Merge: 5e9d33fe87 f7c1d94241 185019 185019 + Merge: 5e9d33fe8 f7c1d9424 184745 185020 Author: Daniel Stone <daniel@fooishbar.org> 184746 185021 Date: Sun Sep 24 17:56:43 2006 +0300 184747 185022 ··· 184945 185220 Thanks, automake. 184946 185221 184947 185222 commit 6926776f0ecd1e8e81c5c40ccd3a97227bc44dcb 184948 184948 - Merge: 6950267dd6 49a70c8570 185223 185223 + Merge: 6950267dd 49a70c857 184949 185224 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 184950 185225 Date: Fri Sep 15 15:28:13 2006 -0400 184951 185226 184952 185227 Merge branch 'my-XACE-modular' into my-XACE-SELINUX 184953 185228 184954 185229 commit 49a70c8570b03aff8239324a2474918a6fbc52a0 184955 184955 - Merge: d1110c5c83 05231e336d 185230 185230 + Merge: d1110c5c8 05231e336 184956 185231 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 184957 185232 Date: Fri Sep 15 15:26:57 2006 -0400 184958 185233 ··· 185180 185455 so I think we can tolerate the extra #ifdef for the next release. 185181 185456 185182 185457 commit 60db190ecfce52cbfa888c0af3210634f9186bed 185183 185183 - Merge: 5e9d33fe87 65256109bb 185458 185458 + Merge: 5e9d33fe8 65256109b 185184 185459 Author: Zephaniah E. Hull <warp@agamemnon.b5> 185185 185460 Date: Sun Sep 10 03:49:17 2006 -0400 185186 185461 ··· 185205 185480 Add SELinux extension configure-time support. 185206 185481 185207 185482 commit fb34c02861ab3629c1c85c156e73b158518db7c7 185208 185208 - Merge: 9c503f09ce d1110c5c83 185483 185483 + Merge: 9c503f09c d1110c5c8 185209 185484 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 185210 185485 Date: Fri Sep 8 15:30:12 2006 -0400 185211 185486 ··· 185273 185548 DRI locking between 2D and 3D drivers around VT switch. 185274 185549 185275 185550 commit 5e9d33fe87f9d24e55c468d4b2bb761c9efdb26a 185276 185276 - Merge: 629798c73a 64479fffa2 185551 185551 + Merge: 629798c73 64479fffa 185277 185552 Author: Daniel Stone <daniel@fooishbar.org> 185278 185553 Date: Thu Sep 7 15:43:31 2006 +0300 185279 185554 ··· 185325 185600 (unsigned long)(1 << 31) = bad news on x86_64. 185326 185601 185327 185602 commit 0b81fccd2ee4e054e5cffb739de07460ff2c13f7 185328 185328 - Merge: 20c4ac6e03 c2813514cf 185603 185603 + Merge: 20c4ac6e0 c2813514c 185329 185604 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 185330 185605 Date: Tue Sep 5 18:03:25 2006 -0400 185331 185606 ··· 185391 185666 appear in the server's string. 185392 185667 185393 185668 commit 1c8851ad491dd02d1c79e620b46384956838ed42 185394 185394 - Merge: d59b52fc08 5ddbf4bcd4 185669 185669 + Merge: d59b52fc0 5ddbf4bcd 185395 185670 Author: Ian Romanick <idr@us.ibm.com> 185396 185671 Date: Tue Aug 29 16:34:04 2006 -0700 185397 185672 ··· 185427 185702 Yeah. That was dumb. 185428 185703 185429 185704 commit 942b4369990a255257f66835caf8671432c405a3 185430 185430 - Merge: 77d315bd2f 393dc0a338 185705 185705 + Merge: 77d315bd2 393dc0a33 185431 185706 Author: Ian Romanick <idr@us.ibm.com> 185432 185707 Date: Tue Aug 29 13:30:37 2006 -0700 185433 185708 ··· 185487 185762 couple of range-related thinkos in level name copying. 185488 185763 185489 185764 commit 7fa3383e3c8eea7d1eb0e556393f2431cf8e6ed2 185490 185490 - Merge: 8d77d44fda ebbdc1342a 185765 185765 + Merge: 8d77d44fd ebbdc1342 185491 185766 Author: Daniel Stone <daniel@fooishbar.org> 185492 185767 Date: Tue Aug 29 15:16:01 2006 +0300 185493 185768 ··· 185500 185775 Remove calls to LoaderCheckUnresolved(), since it's now a stub. 185501 185776 185502 185777 commit 8d77d44fda3aacbae62864a3620e09095b79e92d 185503 185503 - Merge: d6f36bd280 2fde560bbb 185778 185778 + Merge: d6f36bd28 2fde560bb 185504 185779 Author: Daniel Stone <daniel@fooishbar.org> 185505 185780 Date: Sun Aug 27 23:08:49 2006 +0300 185506 185781 185507 185782 Merge branch 'origin' into input-hotplug 185508 185783 185509 185784 commit 20c4ac6e038607ebbf6c04639670514c016d8597 185510 185510 - Merge: 13c6713c82 8d4f21ab53 185785 185785 + Merge: 13c6713c8 8d4f21ab5 185511 185786 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 185512 185787 Date: Fri Aug 25 18:49:46 2006 -0400 185513 185788 ··· 185540 185815 GL_NV_{vertex,fragment}_program, and related extensions can be enabled. 185541 185816 185542 185817 commit 21291d6ca7188e5733ed0c93215ee0f1f0f90cc9 185543 185543 - Merge: 1a5561c4ec cd2da4e41e 185818 185818 + Merge: 1a5561c4e cd2da4e41 185544 185819 Author: Ian Romanick <idr@umwelt.(none)> 185545 185820 Date: Fri Aug 25 09:34:21 2006 -0700 185546 185821 ··· 185555 185830 best-effort attempt to keep configs working. 185556 185831 185557 185832 commit 7c4167f0d6b33c9c602b04fcfd246fd3aeddd709 185558 185558 - Merge: 393f8347ed cd2da4e41e 185833 185833 + Merge: 393f8347e cd2da4e41 185559 185834 Author: Daniel Stone <daniel@fooishbar.org> 185560 185835 Date: Fri Aug 25 11:15:33 2006 +0300 185561 185836 ··· 185597 185872 Add some missing bits of GL_SGI_color_table. 185598 185873 185599 185874 commit ae608b2071d882966e9c7ede71f846b1ecec0b23 185600 185600 - Merge: 2c865277fe b879356ce9 185875 185875 + Merge: 2c865277f b879356ce 185601 185876 Author: Ian Romanick <idr@umwelt.(none)> 185602 185877 Date: Thu Aug 24 14:56:33 2006 -0700 185603 185878 ··· 185620 185895 Regenerate from gl_API.xml 1.62. Functions move, no real changes. 185621 185896 185622 185897 commit 3a36b0a24aa9e9e238faa7f00100f59800f5142b 185623 185623 - Merge: db1ab1bdb2 b879356ce9 185898 185898 + Merge: db1ab1bdb b879356ce 185624 185899 Author: Daniel Stone <daniel@fooishbar.org> 185625 185900 Date: Thu Aug 24 23:35:28 2006 +0300 185626 185901 ··· 185658 185933 More #ifdef USE_DEPRECATED_KEYBOARD_DRIVER. 185659 185934 185660 185935 commit 4ed311cf1c29090c53e474a3001c5702ff8409df 185661 185661 - Merge: 73e58adda9 b29b236d88 185936 185936 + Merge: 73e58adda b29b236d8 185662 185937 Author: Matthias Hopf <mhopf@suse.de> 185663 185938 Date: Thu Aug 24 20:17:10 2006 +0200 185664 185939 ··· 185691 185966 Fix horrendous thinko. Indicators now work perfectly. 185692 185967 185693 185968 commit 4adf9af313c9f63b6ad734e174efe1d36ddb5813 185694 185694 - Merge: 33af05d58f 67bd672c88 185969 185969 + Merge: 33af05d58 67bd672c8 185695 185970 Author: Daniel Stone <daniel@fooishbar.org> 185696 185971 Date: Thu Aug 24 10:59:33 2006 +0300 185697 185972 ··· 185710 185985 Add xorg.conf IgnoreABI option which does the same thing as -ignoreABI 185711 185986 185712 185987 commit b983773d446cef6a0948ca264ed48126e404ae9a 185713 185713 - Merge: 0623d3643f d9a86566c2 185988 185988 + Merge: 0623d3643 d9a86566c 185714 185989 Author: Ian Romanick <idr@umwelt.(none)> 185715 185990 Date: Wed Aug 23 17:16:50 2006 -0700 185716 185991 ··· 185832 186107 the moment), and use that instead of nasty pointer assignments. 185833 186108 185834 186109 commit 52ba722e4c89c052609b4fc62e965d92778aa2dd 185835 185835 - Merge: 9138d5a51e 05541259bd 186110 186110 + Merge: 9138d5a51 05541259b 185836 186111 Author: Eamon Walsh <ewalsh@tycho.nsa.gov> 185837 186112 Date: Mon Aug 21 18:49:31 2006 -0400 185838 186113 185839 186114 Merge branch 'XACE-modular' into my-XACE-modular 185840 186115 185841 186116 commit 05541259bdb0dfaab015a01caa3722b7a1b782e2 185842 185842 - Merge: c2535f6792 a1ac0440bb 186117 186117 + Merge: c2535f679 a1ac0440b 185843 186118 Author: Alan Coopersmith <alan.coopersmith@sun.com> 185844 186119 Date: Mon Aug 21 13:07:41 2006 -0700 185845 186120 ··· 185855 186130 configure time. 185856 186131 185857 186132 commit 0704bb298cc826cd117815898c6bc015a693c2c9 185858 185858 - Merge: c14036977f a1ac0440bb 186133 186133 + Merge: c14036977 a1ac0440b 185859 186134 Author: Daniel Stone <daniel@fooishbar.org> 185860 186135 Date: Fri Aug 18 17:30:14 2006 +0300 185861 186136 ··· 185875 186150 input.h: add InitCoreDevices prototype 185876 186151 185877 186152 commit 1c2cb30cd88ba4453f9da339025f8ff39f7f5412 185878 185878 - Merge: 633b6a69f5 70ddd0f39d 186153 186153 + Merge: 633b6a69f 70ddd0f39 185879 186154 Author: Daniel Stone <daniel@fooishbar.org> 185880 186155 Date: Fri Aug 18 17:05:50 2006 +0300 185881 186156 185882 186157 Merge branch 'origin' into input-hotplug 185883 186158 185884 186159 commit 19f673b7788d32c220e7e06734f1074b0e4a999c 185885 185885 - Merge: cb0a565d2b 70ddd0f39d 186160 186160 + Merge: cb0a565d2 70ddd0f39 185886 186161 Author: Daniel Stone <daniel@fooishbar.org> 185887 186162 Date: Fri Aug 18 17:05:41 2006 +0300 185888 186163 ··· 185905 186180 (Brett Stahlman & Colin Harrison) 185906 186181 185907 186182 commit 708b225689b5a4ba9ffe3372b584b715ef9eacdc 185908 185908 - Merge: e1f4565be5 ee5e2cbd2b 186183 186183 + Merge: e1f4565be ee5e2cbd2 185909 186184 Author: Alan Hourihane <alanh@fairlite.demon.co.uk> 185910 186185 Date: Fri Aug 18 09:13:52 2006 +0100 185911 186186 ··· 185950 186225 It would be really nice if we only did this in one place instead of 40. 185951 186226 185952 186227 commit 633b6a69f560c0a77dcff78fdef5fcf0041e2e04 185953 185953 - Merge: 95dbfcf882 7da51447ea 186228 186228 + Merge: 95dbfcf88 7da51447e 185954 186229 Author: Daniel Stone <daniel@fooishbar.org> 185955 186230 Date: Thu Aug 17 21:25:14 2006 +0300 185956 186231 ··· 186058 186333 Fix debug_events prototype. 186059 186334 186060 186335 commit d003bada3352ec7d734498c4c732904876a9d1e2 186061 186061 - Merge: d6433be3cc a815b9b990 186336 186336 + Merge: d6433be3c a815b9b99 186062 186337 Author: Daniel Stone <daniel@fooishbar.org> 186063 186338 Date: Sat Aug 12 22:48:55 2006 +0300 186064 186339 186065 186340 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug 186066 186341 186067 186342 commit a815b9b990e068f02d9cbba2b17f2cc3a30a9310 186068 186068 - Merge: 37943e2f1a 984babe86b 186343 186343 + Merge: 37943e2f1 984babe86 186069 186344 Author: George Sapountzis <gsap7@yahoo.gr> 186070 186345 Date: Sat Aug 12 21:58:33 2006 +0300 186071 186346 186072 186347 Merge branch 'master' of git+ssh://gsap7@git.freedesktop.org/git/xorg/xserver 186073 186348 186074 186349 commit d6433be3cca807dd78fbb1f45d9ba0212283083d 186075 186075 - Merge: 2bf9e3dc1e 984babe86b 186350 186350 + Merge: 2bf9e3dc1 984babe86 186076 186351 Author: Daniel Stone <daniel@fooishbar.org> 186077 186352 Date: Sat Aug 12 21:50:52 2006 +0300 186078 186353 ··· 186131 186406 Define HAVE_EXECINFO_H as well as HAVE_BACKTRACE, when we find execinfo.h. 186132 186407 186133 186408 commit 26c3cd1c9e3f52548389817a6d89a377e20c4269 186134 186134 - Merge: 008aa7eb6e c4951e0a6b 186409 186409 + Merge: 008aa7eb6 c4951e0a6 186135 186410 Author: Daniel Stone <daniel@fooishbar.org> 186136 186411 Date: Sat Aug 12 18:58:18 2006 +0300 186137 186412 ··· 186160 186435 mode. Also add M_T_PREFERRED bit, to select a 'best' mode out of a set. 186161 186436 186162 186437 commit c2535f67923bde0bfb0e72363467110806e2f40f 186163 186163 - Merge: c0cb8d1fb8 db82e12fac 186438 186438 + Merge: c0cb8d1fb db82e12fa 186164 186439 Author: Alan Coopersmith <alan.coopersmith@sun.com> 186165 186440 Date: Thu Aug 10 10:37:59 2006 -0700 186166 186441 ··· 186182 186457 auto. 186183 186458 186184 186459 commit 1a5561c4ecccaf32b03c41373adf376100d457aa 186185 186185 - Merge: 190f229ed7 db82e12fac 186460 186460 + Merge: 190f229ed db82e12fa 186186 186461 Author: Ian Romanick <idr@umwelt.(none)> 186187 186462 Date: Thu Aug 10 10:20:37 2006 -0700 186188 186463 ··· 186203 186478 XKB (and thus don't need to count the extra repeat events). 186204 186479 186205 186480 commit 172d45b9b75f95c997d1e9358040eead496e2a06 186206 186206 - Merge: 3832a3d7db db82e12fac 186481 186481 + Merge: 3832a3d7d db82e12fa 186207 186482 Author: Daniel Stone <daniel@fooishbar.org> 186208 186483 Date: Thu Aug 10 14:14:54 2006 +0300 186209 186484 ··· 186248 186523 Remove the bc flag from the -help text, since it's gone. 186249 186524 186250 186525 commit 767f372dd02232469f9fd804b811a17eaf762e1e 186251 186251 - Merge: c4f5de6cc3 462bb61b0f 186526 186526 + Merge: c4f5de6cc 462bb61b0 186252 186527 Author: Tilman Sauerbeck <tilman@code-monkey.de> 186253 186528 Date: Wed Aug 9 20:23:30 2006 +0200 186254 186529 ··· 186266 186541 hooks. 186267 186542 186268 186543 commit 5506b4ad200745236f997c121e8200179c47b749 186269 186269 - Merge: 4be9abb850 462bb61b0f 186544 186544 + Merge: 4be9abb85 462bb61b0 186270 186545 Author: Daniel Stone <daniel@fooishbar.org> 186271 186546 Date: Wed Aug 9 07:21:01 2006 +0300 186272 186547 ··· 186327 186602 Sending MapNotify is more correct in this case than NKN, so do that. 186328 186603 186329 186604 commit 31089816317f27c668b12a15c74fdd226a8df9f7 186330 186330 - Merge: ab3ebfefdb 12dbd8a02f 186605 186605 + Merge: ab3ebfefd 12dbd8a02 186331 186606 Author: Daniel Stone <daniel@fooishbar.org> 186332 186607 Date: Tue Aug 8 12:01:12 2006 +0300 186333 186608 ··· 186451 186726 memcpy events into our event structure instead of doing pointer assignment. 186452 186727 186453 186728 commit c85e64cba1d2d88f676ca7cf23b52a6f8219e90e 186454 186454 - Merge: a406f6bfea f54b71b772 186729 186729 + Merge: a406f6bfe f54b71b77 186455 186730 Author: Daniel Stone <daniel@fooishbar.org> 186456 186731 Date: Mon Aug 7 15:54:55 2006 +0300 186457 186732 ··· 186538 186813 Remove pciConfigPtr and all of the associated cruft. 186539 186814 186540 186815 commit 966ebd3d2d84b440e89504d055a0e937303ed11d 186541 186541 - Merge: a94176627c 39169fd373 186816 186816 + Merge: a94176627 39169fd37 186542 186817 Author: Ian Romanick <idr@umwelt.(none)> 186543 186818 Date: Wed Aug 2 08:14:58 2006 -0700 186544 186819 ··· 186593 186868 Build fixes for last pull from HEAD. 186594 186869 186595 186870 commit 65dc25d8f86b962f2adc765a9ff327419f98092b 186596 186596 - Merge: 69533fc04f b74c845a12 186871 186871 + Merge: 69533fc04 b74c845a1 186597 186872 Author: Ian Romanick <idr@umwelt.(none)> 186598 186873 Date: Mon Jul 31 12:30:30 2006 -0700 186599 186874 186600 186875 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 186601 186876 186602 186877 commit b74c845a1233f78b841ff8840272c50873300c20 186603 186603 - Merge: 3112a6c4f2 02daa6bb10 186878 186878 + Merge: 3112a6c4f 02daa6bb1 186604 186879 Author: Ian Romanick <idr@umwelt.(none)> 186605 186880 Date: Mon Jul 31 10:26:06 2006 -0700 186606 186881 ··· 186624 186899 and GC stripple and tile pixmaps. 186625 186900 186626 186901 commit 69533fc04f38c67fd424776c5191a4ba57ba8c8f 186627 186627 - Merge: ef1aecaaf6 24051ef974 186902 186902 + Merge: ef1aecaaf 24051ef97 186628 186903 Author: Ian Romanick <idr@umwelt.(none)> 186629 186904 Date: Mon Jul 31 09:26:04 2006 -0700 186630 186905 ··· 186672 186947 remove README (which doesn't exist) from EXTRA_DIST 186673 186948 186674 186949 commit 87fe85f38b6f781bf0e2eb555526e3d77779f9fa 186675 186675 - Merge: 3518e2d0de 654619d76c 186950 186950 + Merge: 3518e2d0d 654619d76 186676 186951 Author: Daniel Stone <daniel@fooishbar.org> 186677 186952 Date: Sun Jul 30 10:51:34 2006 +0300 186678 186953 ··· 186770 187045 Pass correct pointer to xf86MapLegacyIO. 186771 187046 186772 187047 commit 3518e2d0debc97e2bacdefe604b280e7fdfdd216 186773 186773 - Merge: eb7733a48a 3821f6aeaa 187048 187048 + Merge: eb7733a48 3821f6aea 186774 187049 Author: Daniel Stone <daniel@fooishbar.org> 186775 187050 Date: Wed Jul 26 11:29:21 2006 +0300 186776 187051 ··· 186797 187072 pci_device_get_bridge_buses can be used. 186798 187073 186799 187074 commit 380b51d605a82c98082a2cebd70a0d1d0735eaa7 186800 186800 - Merge: 82f6b7e75e 8977b07434 187075 187075 + Merge: 82f6b7e75 8977b0743 186801 187076 Author: Ian Romanick <idr@umwelt.(none)> 186802 187077 Date: Tue Jul 25 11:30:04 2006 -0700 186803 187078 ··· 186895 187170 Allow XOpenDevice on closed devices. 186896 187171 186897 187172 commit e73e5e2a4d8f22889d840a7719479f9af686cb9c 186898 186898 - Merge: a73cef1f00 8977b07434 187173 187173 + Merge: a73cef1f0 8977b0743 186899 187174 Author: Daniel Stone <daniel@fooishbar.org> 186900 187175 Date: Sat Jul 22 13:56:30 2006 -0400 186901 187176 ··· 186908 187183 glx: fix typo from tag removal 186909 187184 186910 187185 commit a73cef1f005ca66db18e952e676ee5a21b829700 186911 186911 - Merge: 672ca156bf 70869fc677 187186 187186 + Merge: 672ca156b 70869fc67 186912 187187 Author: Daniel Stone <daniel@fooishbar.org> 186913 187188 Date: Sat Jul 22 12:07:22 2006 -0400 186914 187189 ··· 186951 187226 Fix stupid typos. 186952 187227 186953 187228 commit 672ca156bfb11440e6e234650bfba9d38e1edb52 186954 186954 - Merge: d14d91f094 6cf844ab69 187229 187229 + Merge: d14d91f09 6cf844ab6 186955 187230 Author: Daniel Stone <daniel@fooishbar.org> 186956 187231 Date: Fri Jul 21 19:58:42 2006 -0400 186957 187232 ··· 186984 187259 which in turn allows the elimination of hw/xfree86/int10/pci.c. 186985 187260 186986 187261 commit 87a6346bf7f086b5f98b2b2ecd52f27efe864e56 186987 186987 - Merge: b73fb2ae35 0486d3966d 187262 187262 + Merge: b73fb2ae3 0486d3966 186988 187263 Author: Daniel Stone <daniel@fooishbar.org> 186989 187264 Date: Fri Jul 21 19:36:25 2006 -0400 186990 187265 ··· 186999 187274 XkbSA_XFree86Private. 187000 187275 187001 187276 commit b73fb2ae35a82e0bdd48f01132e971fb84946ff1 187002 187002 - Merge: e7ac27ad81 aff404f293 187277 187277 + Merge: e7ac27ad8 aff404f29 187003 187278 Author: Daniel Stone <daniel@fooishbar.org> 187004 187279 Date: Fri Jul 21 19:30:26 2006 -0400 187005 187280 ··· 187021 187296 Ugh. 187022 187297 187023 187298 commit 7465010d59ec435bd00b738f0cef766b352dc7eb 187024 187024 - Merge: 1d31ed7782 0aaac95b0d 187299 187299 + Merge: 1d31ed778 0aaac95b0 187025 187300 Author: Daniel Stone <daniel@fooishbar.org> 187026 187301 Date: Fri Jul 21 19:05:41 2006 -0400 187027 187302 ··· 187047 187322 Remove the loader's required and referenced symbol lists, dead code. 187048 187323 187049 187324 commit 07ad92d2c4cb07db8487d76efc822fd7b88137cb 187050 187050 - Merge: 18624a9b7c 22db3fdb54 187325 187325 + Merge: 18624a9b7 22db3fdb5 187051 187326 Author: Ian Romanick <idr@umwelt.(none)> 187052 187327 Date: Fri Jul 21 15:25:35 2006 -0700 187053 187328 ··· 187078 187353 Fix the RandR failure path for rotated screens. 187079 187354 187080 187355 commit 22db3fdb54d2f7f6b72638b46c186af6db04e214 187081 187081 - Merge: 2f98841fde 93cd53860c 187356 187356 + Merge: 2f98841fd 93cd53860 187082 187357 Author: Ian Romanick <idr@umwelt.(none)> 187083 187358 Date: Fri Jul 21 13:55:37 2006 -0700 187084 187359 ··· 187321 187596 Remove the DDXTIME conditional, for being unused. 187322 187597 187323 187598 commit c69c00d6523a35232a32e54a533811fc2b37815a 187324 187324 - Merge: 46369350d4 84683f19b4 187599 187599 + Merge: 46369350d 84683f19b 187325 187600 Author: Ian Romanick <idr@umwelt.(none)> 187326 187601 Date: Thu Jul 20 12:08:38 2006 -0700 187327 187602 ··· 187395 187670 Modify linuxGetSizesStruct to use pci_device instead of pciConfigPtr. 187396 187671 187397 187672 commit 12595a77d6c2f037f48dfe751bdc10505b3317df 187398 187398 - Merge: 37838de62e 4c225a3a8b 187673 187673 + Merge: 37838de62 4c225a3a8 187399 187674 Author: Ian Romanick <idr@umwelt.(none)> 187400 187675 Date: Thu Jul 13 12:48:03 2006 -0700 187401 187676 ··· 187436 187711 Fix crash in Xephyr when running on host X with keymap width < 4 ( i.e xvnc ) 187437 187712 187438 187713 commit 21e3e3ca298dce22e5fad6ef38aa6fe9736a1d3b 187439 187439 - Merge: e805621894 39b2f7b218 187714 187714 + Merge: e80562189 39b2f7b21 187440 187715 Author: Matthew Allum <mallum@polystyrene.(none)> 187441 187716 Date: Sat Jul 8 21:13:52 2006 +0100 187442 187717 ··· 187523 187798 Switch the default mouse device on Linux to /dev/input/mice. 187524 187799 187525 187800 commit 37838de62edc474f44c0a48bd56470a6c23f8956 187526 187526 - Merge: fd49a0dcc1 8d07ee070e 187801 187801 + Merge: fd49a0dcc 8d07ee070 187527 187802 Author: Ian Romanick <idr@umwelt.(none)> 187528 187803 Date: Thu Jul 6 13:01:57 2006 -0700 187529 187804 ··· 187549 187824 Spotted by Aaron Plattner. 187550 187825 187551 187826 commit fd49a0dcc13280cf195bd6c7ee0f23d0840cb665 187552 187552 - Merge: e66e7b48e1 28b95fd9d1 187827 187827 + Merge: e66e7b48e 28b95fd9d 187553 187828 Author: Ian Romanick <idr@umwelt.(none)> 187554 187829 Date: Thu Jul 6 09:52:15 2006 -0700 187555 187830 ··· 187607 187882 DoGetDrawableAttributes and __glXQueryContextInfoEXT. 187608 187883 187609 187884 commit e66e7b48e15543f3753951a19376f0446759963a 187610 187610 - Merge: a9d4842893 eb35f812a5 187885 187885 + Merge: a9d484289 eb35f812a 187611 187886 Author: Ian Romanick <idr@umwelt.(none)> 187612 187887 Date: Wed Jul 5 15:21:36 2006 -0700 187613 187888 ··· 187721 187996 Missing close parenthesis in one of the setuid() fixes. 187722 187997 187723 187998 commit 124a81eb389dfa510ac07ca93ee17c4c9d6e56ea 187724 187724 - Merge: d3d6c5f4d0 179737d4a0 187999 187999 + Merge: d3d6c5f4d 179737d4a 187725 188000 Author: Keith Packard <keithp@neko.keithp.com> 187726 188001 Date: Sat Jul 1 11:12:50 2006 -0700 187727 188002 ··· 187749 188024 Move variable declarations to start of blocks as required by c89 187750 188025 187751 188026 commit a9d4842893b65232d61fe4c63f074d30e81021d2 187752 187752 - Merge: 66cac9b174 6bd4c25439 188027 188027 + Merge: 66cac9b17 6bd4c2543 187753 188028 Author: Ian Romanick <idr@umwelt.(none)> 187754 188029 Date: Fri Jun 30 11:49:29 2006 -0700 187755 188030 ··· 187763 188038 Updated for Solaris 10 changes to DDI 187764 188039 187765 188040 commit 66cac9b17498497d939bfb7a4075bcee5a485e5f 187766 187766 - Merge: 7c4e540253 54d9acd511 188041 188041 + Merge: 7c4e54025 54d9acd51 187767 188042 Author: Ian Romanick <idr@umwelt.(none)> 187768 188043 Date: Wed Jun 28 14:11:49 2006 -0700 187769 188044 ··· 187800 188075 cairo's clip-operator test. 187801 188076 187802 188077 commit 7c4e54025345455f420cd2abaa7a40679689d3cb 187803 187803 - Merge: 9d0a15dca5 ff6b59a0db 188078 188078 + Merge: 9d0a15dca ff6b59a0d 187804 188079 Author: Ian Romanick <idr@umwelt.(none)> 187805 188080 Date: Mon Jun 26 14:39:44 2006 -0700 187806 188081 187807 188082 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into pci-rework 187808 188083 187809 188084 commit ff6b59a0dbadbe61a53e48c23965d3073d95791b 187810 187810 - Merge: b3c869304c 48c871564d 188085 188085 + Merge: b3c869304 48c871564 187811 188086 Author: Alan Coopersmith <alan.coopersmith@sun.com> 187812 188087 Date: Mon Jun 26 13:02:33 2006 -0700 187813 188088 ··· 187890 188165 Add a manpage for EXA. 187891 188166 187892 188167 commit 9d0a15dca56b14821cad474f9db9c332acb3b1e6 187893 187893 - Merge: 6c514ca14c d67fd10696 188168 188168 + Merge: 6c514ca14 d67fd1069 187894 188169 Author: Ian Romanick <idr@umwelt.(none)> 187895 188170 Date: Thu Jun 22 16:21:10 2006 -0700 187896 188171 ··· 187926 188201 Use XACE, not XCSECURITY to decide if SecurityLookup* are exported 187927 188202 187928 188203 commit 3177dc498a955cd58cd6054a7c7e69724db4a59b 187929 187929 - Merge: 3f19803e0b 91dcac5295 188204 188204 + Merge: 3f19803e0 91dcac529 187930 188205 Author: Alan Coopersmith <alan.coopersmith@sun.com> 187931 188206 Date: Wed Jun 21 18:06:06 2006 -0700 187932 188207 ··· 187939 188214 APPGROUP requires both X-ACE & XC-SECURITY now 187940 188215 187941 188216 commit 91dcac5295486cc55a34ad91704bfa483bd31eeb 187942 187942 - Merge: d8135eb9e4 77c947b900 188217 188217 + Merge: d8135eb9e 77c947b90 187943 188218 Author: Adam Jackson <ajax@benzedrine.nwnk.net> 187944 188219 Date: Wed Jun 21 20:49:30 2006 -0400 187945 188220 ··· 187966 188241 Correct ifdef - should be XACE, not XSECURITY 187967 188242 187968 188243 commit 90af38fa0c46c2081d2becac262a614c26ba6ef1 187969 187969 - Merge: 3e098efa35 77c947b900 188244 188244 + Merge: 3e098efa3 77c947b90 187970 188245 Author: Alan Coopersmith <alan.coopersmith@sun.com> 187971 188246 Date: Wed Jun 21 16:23:31 2006 -0700 187972 188247 ··· 187993 188268 of updates.) 187994 188269 187995 188270 commit aa131c51e06e735d7b54cadf51205f703a3de4ef 187996 187996 - Merge: 1708b0c7d9 77aa701e89 188271 188271 + Merge: 1708b0c7d 77aa701e8 187997 188272 Author: Ian Romanick <idr@umwelt.(none)> 187998 188273 Date: Wed Jun 21 14:39:52 2006 -0700 187999 188274 ··· 188061 188336 - Added X-ACE sources to Xext/Makefile.am 188062 188337 188063 188338 commit a46c06dab8392cf8012c7cc0b916de9a9e569671 188064 188064 - Merge: 49b368c0bb d44b2a0a57 188339 188339 + Merge: 49b368c0b d44b2a0a5 188065 188340 Author: Alan Coopersmith <alan.coopersmith@sun.com> 188066 188341 Date: Tue Jun 20 18:40:18 2006 -0700 188067 188342 ··· 188093 188368 Move Xserver API for security extension to securitysrv.h 188094 188369 188095 188370 commit 49b368c0bb04816c4a3579071c596b2398cae3ec 188096 188096 - Merge: 63f6e6bbfd 481d4012e7 188371 188371 + Merge: 63f6e6bbf 481d4012e 188097 188372 Author: Alan Coopersmith <alanc@alf.(none)> 188098 188373 Date: Tue Jun 20 16:22:39 2006 -0700 188099 188374 ··· 188106 188381 Don't add -ldl to XORG_LIBS if it's not needed for dlopen 188107 188382 188108 188383 commit 63f6e6bbfd0d3677e29621af982c9392ead98dd7 188109 188109 - Merge: 88ede2cec7 6df52fb774 188384 188384 + Merge: 88ede2cec 6df52fb77 188110 188385 Author: Alan Coopersmith <alanc@alf.(none)> 188111 188386 Date: Tue Jun 20 16:03:34 2006 -0700 188112 188387 ··· 188119 188394 Delete code that's been inside #if 0 since X11R6.7. 188120 188395 188121 188396 commit 75398cff82b56c0a8fc301e84e2087f59a61a360 188122 188122 - Merge: 1f91b5726c 2b58685402 188397 188397 + Merge: 1f91b5726 2b5868540 188123 188398 Author: Ian Romanick <idr@umwelt.(none)> 188124 188399 Date: Tue Jun 20 15:49:47 2006 -0700 188125 188400 ··· 188131 188406 hw/xfree86/loader/xf86sym.c 188132 188407 188133 188408 commit 88ede2cec79281a43cecb43ee6dec65770f82530 188134 188134 - Merge: 227a319340 2b58685402 188409 188409 + Merge: 227a31934 2b5868540 188135 188410 Author: Alan Coopersmith <alanc@alf.(none)> 188136 188411 Date: Tue Jun 20 15:29:55 2006 -0700 188137 188412 ··· 188181 188456 (cherry picked from 0106715000196c7b349a0b4494b61545f0f5e138 commit) 188182 188457 188183 188458 commit 0707eb33d6826e1300a905edea28c12134600b12 188184 188184 - Merge: 37f0ae0245 98d17bba71 188459 188459 + Merge: 37f0ae024 98d17bba7 188185 188460 Author: Alan Coopersmith <alanc@alf.(none)> 188186 188461 Date: Mon Jun 19 17:09:51 2006 -0700 188187 188462 ··· 188346 188621 hadn't been bumped. 188347 188622 188348 188623 commit 72ac20c0e878ad48ff61f7e846cbf1005a4eb435 188349 188349 - Merge: fc3e81473a b90088321e 188624 188624 + Merge: fc3e81473 b90088321 188350 188625 Author: Ian Romanick <idr@localhost.localdomain> 188351 188626 Date: Tue Jun 13 21:13:02 2006 -0700 188352 188627 ··· 188373 188648 Provide option to report damage after operation is complete. 188374 188649 188375 188650 commit fc3e81473a98d3b932faa73c0c01c21366a48a9e 188376 188376 - Merge: 4bedaad17d 041ef23192 188651 188651 + Merge: 4bedaad17 041ef2319 188377 188652 Author: Ian Romanick <idr@localhost.localdomain> 188378 188653 Date: Mon Jun 12 09:41:06 2006 -0700 188379 188654 ··· 188410 188685 another function that was already in that file. 188411 188686 188412 188687 commit 7810d87cd6ae9316d88f6a2e7696deb8837cec27 188413 188413 - Merge: dcfaa9f4f8 caad8b724b 188688 188688 + Merge: dcfaa9f4f caad8b724 188414 188689 Author: Ian Romanick <idr@localhost.localdomain> 188415 188690 Date: Fri Jun 9 15:16:50 2006 -0700 188416 188691 ··· 188482 188757 based on FIXME in mi/miinitext.c 188483 188758 188484 188759 commit dcfaa9f4f8fb10b75be50c9a49ccd88caf6d0f6a 188485 188485 - Merge: af9afe4cc5 576e6fb112 188760 188760 + Merge: af9afe4cc 576e6fb11 188486 188761 Author: Ian Romanick <idr@localhost.localdomain> 188487 188762 Date: Thu Jun 8 15:03:00 2006 -0700 188488 188763 ··· 188502 188777 Bug #7121: fix clipboard handling in Xming (Colin Harrison) 188503 188778 188504 188779 commit af9afe4cc50df973bea2293a803f7dfdefaa6411 188505 188505 - Merge: caffac3843 3930da3f62 188780 188780 + Merge: caffac384 3930da3f6 188506 188781 Author: Ian Romanick <idr@localhost.localdomain> 188507 188782 Date: Thu Jun 8 11:37:09 2006 -0700 188508 188783 ··· 188579 188854 if anyone really cares about this code. 188580 188855 188581 188856 commit caffac38432009e8dc01e7d3e72a7fa6fba2f078 188582 188582 - Merge: c5b3aa120b 9fa73721f0 188857 188857 + Merge: c5b3aa120 9fa73721f 188583 188858 Author: Ian Romanick <idr@localhost.localdomain> 188584 188859 Date: Thu Jun 8 10:38:43 2006 -0700 188585 188860 ··· 188690 188965 when the symbol PCI_DOM_FROM_TAG couldn't be resolved at run-time. 188691 188966 188692 188967 commit 23182315f34e3a0065739b43b15d4560e75b41a1 188693 188693 - Merge: bc05158a5a 757f40fca5 188968 188968 + Merge: bc05158a5 757f40fca 188694 188969 Author: Ian Romanick <idr@localhost.localdomain> 188695 188970 Date: Wed Jun 7 17:03:48 2006 -0700 188696 188971 ··· 188727 189002 updated the .gitignore file with more auto-generated files 188728 189003 188729 189004 commit bc05158a5ab00c548e4b04b5638afe07bc702260 188730 188730 - Merge: 46f55f5dea cc465800dd 189005 189005 + Merge: 46f55f5de cc465800d 188731 189006 Author: Ian Romanick <idr@localhost.localdomain> 188732 189007 Date: Wed Jun 7 14:09:12 2006 -0700 188733 189008 ··· 188747 189022 Fix compiler warnings about SetVendorRelease and SetVendorString 188748 189023 188749 189024 commit 785c9789704ed142fe98cd17b5995e4a95b7141f 188750 188750 - Merge: 21ebcfd702 36d786e9f0 189025 189025 + Merge: 21ebcfd70 36d786e9f 188751 189026 Author: Greg Kroah-Hartman <gregkh@suse.de> 188752 189027 Date: Wed Jun 7 13:20:21 2006 -0700 188753 189028

+14 -14

xserver/configure

reviewed

··· 1 1 #! /bin/sh 2 2 # Guess values for system-dependent variables and create Makefiles. 3 3 - # Generated by GNU Autoconf 2.71 for xorg-server 21.1.10. 3 3 + # Generated by GNU Autoconf 2.71 for xorg-server 21.1.11. 4 4 # 5 5 # Report bugs to <https://gitlab.freedesktop.org/xorg/xserver/issues>. 6 6 # ··· 682 682 # Identity of this package. 683 683 PACKAGE_NAME='xorg-server' 684 684 PACKAGE_TARNAME='xorg-server' 685 685 - PACKAGE_VERSION='21.1.10' 686 686 - PACKAGE_STRING='xorg-server 21.1.10' 685 685 + PACKAGE_VERSION='21.1.11' 686 686 + PACKAGE_STRING='xorg-server 21.1.11' 687 687 PACKAGE_BUGREPORT='https://gitlab.freedesktop.org/xorg/xserver/issues' 688 688 PACKAGE_URL='' 689 689 ··· 2015 2015 # Omit some internal or obsolete options to make the list less imposing. 2016 2016 # This message is too long to be a string in the A/UX 3.1 sh. 2017 2017 cat <<_ACEOF 2018 2018 - \`configure' configures xorg-server 21.1.10 to adapt to many kinds of systems. 2018 2018 + \`configure' configures xorg-server 21.1.11 to adapt to many kinds of systems. 2019 2019 2020 2020 Usage: $0 [OPTION]... [VAR=VALUE]... 2021 2021 ··· 2086 2086 2087 2087 if test -n "$ac_init_help"; then 2088 2088 case $ac_init_help in 2089 2089 - short | recursive ) echo "Configuration of xorg-server 21.1.10:";; 2089 2089 + short | recursive ) echo "Configuration of xorg-server 21.1.11:";; 2090 2090 esac 2091 2091 cat <<\_ACEOF 2092 2092 ··· 2275 2275 org.x) 2276 2276 --with-bundle-version=VERSION 2277 2277 Version to use for X11.app's CFBundleVersion 2278 2278 - (default: 21.1.10) 2278 2278 + (default: 21.1.11) 2279 2279 --with-bundle-version-string=VERSION 2280 2280 Version to use for X11.app's 2281 2281 - CFBundleShortVersionString (default: 21.1.10) 2281 2281 + CFBundleShortVersionString (default: 21.1.11) 2282 2282 --with-sparkle-feed-url=URL 2283 2283 URL for the Sparkle feed (default: 2284 2284 https://www.xquartz.org/releases/sparkle/release.xml) ··· 2493 2493 test -n "$ac_init_help" && exit $ac_status 2494 2494 if $ac_init_version; then 2495 2495 cat <<\_ACEOF 2496 2496 - xorg-server configure 21.1.10 2496 2496 + xorg-server configure 21.1.11 2497 2497 generated by GNU Autoconf 2.71 2498 2498 2499 2499 Copyright (C) 2021 Free Software Foundation, Inc. ··· 3150 3150 This file contains any messages produced by compilers while 3151 3151 running configure, to aid debugging if configure makes a mistake. 3152 3152 3153 3153 - It was created by xorg-server $as_me 21.1.10, which was 3153 3153 + It was created by xorg-server $as_me 21.1.11, which was 3154 3154 generated by GNU Autoconf 2.71. Invocation command line was 3155 3155 3156 3156 $ $0$ac_configure_args_raw ··· 3907 3907 ac_compiler_gnu=$ac_cv_c_compiler_gnu 3908 3908 3909 3909 3910 3910 - RELEASE_DATE="2023-12-13" 3910 3910 + RELEASE_DATE="2024-01-16" 3911 3911 RELEASE_NAME="Caramel Ice Cream" 3912 3912 3913 3913 ··· 4388 4388 4389 4389 # Define the identity of the package. 4390 4390 PACKAGE='xorg-server' 4391 4391 - VERSION='21.1.10' 4391 4391 + VERSION='21.1.11' 4392 4392 4393 4393 4394 4394 printf "%s\n" "#define PACKAGE \"$PACKAGE\"" >>confdefs.h ··· 24439 24439 then : 24440 24440 withval=$with_bundle_version; BUNDLE_VERSION="${withval}" 24441 24441 else $as_nop 24442 24442 - BUNDLE_VERSION="21.1.10" 24442 24442 + BUNDLE_VERSION="21.1.11" 24443 24443 fi 24444 24444 24445 24445 ··· 33105 33105 # report actual input values of CONFIG_FILES etc. instead of their 33106 33106 # values after options handling. 33107 33107 ac_log=" 33108 33108 - This file was extended by xorg-server $as_me 21.1.10, which was 33108 33108 + This file was extended by xorg-server $as_me 21.1.11, which was 33109 33109 generated by GNU Autoconf 2.71. Invocation command line was 33110 33110 33111 33111 CONFIG_FILES = $CONFIG_FILES ··· 33173 33173 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 33174 33174 ac_cs_config='$ac_cs_config_escaped' 33175 33175 ac_cs_version="\\ 33176 33176 - xorg-server config.status 21.1.10 33176 33176 + xorg-server config.status 21.1.11 33177 33177 configured by $0, generated by GNU Autoconf 2.71, 33178 33178 with options \\"\$ac_cs_config\\" 33179 33179

+2 -2

xserver/configure.ac

reviewed

··· 26 26 dnl Process this file with autoconf to create configure. 27 27 28 28 AC_PREREQ(2.60) 29 29 - AC_INIT([xorg-server], 21.1.10, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) 30 30 - RELEASE_DATE="2023-12-13" 29 29 + AC_INIT([xorg-server], 21.1.11, [https://gitlab.freedesktop.org/xorg/xserver/issues], xorg-server) 30 30 + RELEASE_DATE="2024-01-16" 31 31 RELEASE_NAME="Caramel Ice Cream" 32 32 AC_CONFIG_SRCDIR([Makefile.am]) 33 33 AC_CONFIG_MACRO_DIR([m4])

+2 -2

xserver/meson.build

reviewed

··· 3 3 'buildtype=debugoptimized', 4 4 'c_std=gnu99', 5 5 ], 6 6 - version: '21.1.10', 6 6 + version: '21.1.11', 7 7 meson_version: '>= 0.47.0', 8 8 ) 9 9 - release_date = '2023-12-13' 9 9 + release_date = '2024-01-16' 10 10 11 11 add_project_arguments('-DHAVE_DIX_CONFIG_H', language: ['c', 'objc']) 12 12 cc = meson.get_compiler('c')

-22

xserver/randr/rrmonitor.c

reviewed

··· 518 518 519 519 for (m = 0; m < pScrPriv->numMonitors; m++) { 520 520 RRMonitorPtr existing = pScrPriv->monitors[m]; 521 521 - int o, eo; 522 521 523 522 /* If 'name' matches an existing Monitor on the screen, the 524 523 * existing one will be deleted as if RRDeleteMonitor were called. ··· 528 527 continue; 529 528 } 530 529 531 531 - /* For each output in 'info.outputs', each one is removed from all 532 532 - * pre-existing Monitors. If removing the output causes the list 533 533 - * of outputs for that Monitor to become empty, then that 534 534 - * Monitor will be deleted as if RRDeleteMonitor were called. 535 535 - */ 536 536 - 537 537 - for (eo = 0; eo < existing->numOutputs; eo++) { 538 538 - for (o = 0; o < monitor->numOutputs; o++) { 539 539 - if (monitor->outputs[o] == existing->outputs[eo]) { 540 540 - memmove(existing->outputs + eo, existing->outputs + eo + 1, 541 541 - (existing->numOutputs - (eo + 1)) * sizeof (RROutput)); 542 542 - --existing->numOutputs; 543 543 - --eo; 544 544 - break; 545 545 - } 546 546 - } 547 547 - if (existing->numOutputs == 0) { 548 548 - (void) RRMonitorDelete(client, screen, existing->name); 549 549 - break; 550 550 - } 551 551 - } 552 530 if (monitor->primary) 553 531 existing->primary = FALSE; 554 532 }