Just to clarify; Alexandre generally prefers to do the merges in one chunk, it makes it a lot easier, and it is the only way our guys get any credit for the work they do.
The cxoffice Wine code is up there, and is LGPL, and folks are more then welcome to look at it/use it/submit patches with it. You'll just make Alexandre grumpy and slow him down even more if you don't let him finish the merge.
Of course, the merge would probably be done by now, if it weren't for all those dx related patches...<grin>.
Cheers,
Jeremy
Sylvain Petreolle wrote:
'OOPS' :/ Silly me, I forgot that I applied some patches somewhere else :). Of course, this second hunk has nothing to do there.
--- Dmitry Timoshkov dmitry@baikal.ru a écrit :
"Sylvain Petreolle" spetreolle@yahoo.fr wrote:
@@ -1013,7 +1013,8 @@ predefined group index and find it dynamically Ref: X Keyboard Extension: Library specification (section 14.1.1
and 17.1.1) */
- AltGrMask = event->state & 0x6000;
- /* Save also all possible modifier states. */
- AltGrMask = event->state & (0x6000 | Mod1Mask | Mod2Mask |
Mod3Mask | Mod4Mask | Mod5Mask);
Str[ascii_chars] = '\0'; if (TRACE_ON(key)){
I assume that this part of the diff went in by a mistake. Doesn't it? Or you expect that if you borrow a little bit from the CX Office source it will be silently attributed to you? Please don't do this in future, Alexandre will do the merge on his own.
-- Dmitry.
===== Sylvain Petreolle (spetreolle at users dot sourceforge dot net) ICQ #170597259 No more War !
"What if tomorrow the War could be over ?" Morpheus, in "Reloaded".
For the Law of Oil and Fire, Im an European that lives in France. For all my Brothers and friends, Im a human living on Earth.
Do You Yahoo!? -- Une adresse @yahoo.fr gratuite et en français ! Yahoo! Mail : http://fr.mail.yahoo.com