[Bug 17050] eMule: Ends up eating all the memory (swap included)

wine-bugs at winehq.org wine-bugs at winehq.org
Sun Feb 15 08:44:50 CST 2009


http://bugs.winehq.org/show_bug.cgi?id=17050





--- Comment #11 from Alois <MadLoisae at gmx.net>  2009-02-15 08:44:49 ---
(In reply to comment #10)
> 
> You could 'git revert' it, then build again and test.
> 

thanks, but I cannot revert ... there are conflicts ):

cableguy:/home/wine-git# git revert 34aa6b7002af0155c6f0cc31a013391b17f62eea
Auto-merged dlls/kernel32/profile.c
Auto-merged dlls/kernel32/tests/profile.c
CONFLICT (content): Merge conflict in dlls/kernel32/tests/profile.c
Automatic revert failed.  After resolving the conflicts,
mark the corrected paths with 'git add <paths>' or 'git rm <paths>' and commit
the result.

in the meanwhile I removed the directory wine-git and downloaded a "fresh" one
... same conflicts.
i looked at the changelog of wine, I cannot find the commit. ): ... it should
be between Release 1.1.3 and Release 1.1.4 ...

kind regards, Alois


-- 
Configure bugmail: http://bugs.winehq.org/userprefs.cgi?tab=email
Do not reply to this email, post in Bugzilla using the
above URL to reply.
------- You are receiving this mail because: -------
You are watching all bug changes.



More information about the wine-bugs mailing list