| commit | f4d5f8178ec8778a35500dfad94699518fd4e51d | |
| author | Maarten Lankhorst <maarten.lankhorst@canonical.com> | |
| Sun, 19 Aug 2012 12:01:53 +0000 (19 14:01 +0200) | ||
| committer | Maarten Lankhorst <maarten.lankhorst@canonical.com> | |
| Sun, 19 Aug 2012 12:01:53 +0000 (19 14:01 +0200) | ||
| tree | d7ce2b0ba0580272931112acc7866126d23b3c29 | treesnapshot (tar.gz zip) |
| parent | 8447de99e1383770582a261ee18c7ae6741b0bf2 | commitdiff |
| parent | 49550c647d80de74362aaa27ba2f60da5d90a85b | commitdiff |
Evilly merge tag 'wine-1.5.11' into dsoal
Conflict resolution:
tag=wine-1.5.11
git merge $tag
git add dlls/dsound
git checkout HEAD dlls/dsound
git checkout $tag dlls/dsound/tests
Fixing up compile and work with tests is done separately, afterwards
Release 1.5.11
Conflicts:
dlls/dsound/buffer.c
dlls/dsound/capture.c
dlls/dsound/dsound.c
dlls/dsound/dsound_private.h
dlls/dsound/duplex.c
Conflict resolution:
tag=wine-1.5.11
git merge $tag
git add dlls/dsound
git checkout HEAD dlls/dsound
git checkout $tag dlls/dsound/tests
Fixing up compile and work with tests is done separately, afterwards
Release 1.5.11
Conflicts:
dlls/dsound/buffer.c
dlls/dsound/capture.c
dlls/dsound/dsound.c
dlls/dsound/dsound_private.h
dlls/dsound/duplex.c
26 files changed: