| commit | bef9eeb0a612d56d8f8238d9d2e446e1b6592da9 | |
| author | Owen Rudge <owen@owenrudge.net> | |
| Fri, 11 Jul 2008 16:28:07 +0000 (11 17:28 +0100) | ||
| committer | Owen Rudge <owen@owenrudge.net> | |
| Fri, 11 Jul 2008 16:28:07 +0000 (11 17:28 +0100) | ||
| tree | 1e4f1ea43ee4b1fe1761e5a98de630aaf55cf8a5 | treesnapshot (tar.gz zip) |
| parent | ce4264b6f84b01c50ad891626060d88c7df84822 | commitdiff |
| parent | a0289148e14728e45587b8cb17f90862d8400939 | commitdiff |
Merge commit 'winegit/master'
Conflicts:
dlls/dinput/tests/joystick.c
dlls/gdiplus/font.c
dlls/gdiplus/tests/font.c
dlls/quartz/parser.c
dlls/quartz/pin.c
dlls/riched20/caret.c
dlls/riched20/editor.c
dlls/riched20/editor.h
dlls/wined3d/arb_program_shader.c
dlls/wined3d/baseshader.c
dlls/wined3d/glsl_shader.c
programs/winhlp32/Ko.rc
programs/winhlp32/No.rc
Conflicts:
dlls/dinput/tests/joystick.c
dlls/gdiplus/font.c
dlls/gdiplus/tests/font.c
dlls/quartz/parser.c
dlls/quartz/pin.c
dlls/riched20/caret.c
dlls/riched20/editor.c
dlls/riched20/editor.h
dlls/wined3d/arb_program_shader.c
dlls/wined3d/baseshader.c
dlls/wined3d/glsl_shader.c
programs/winhlp32/Ko.rc
programs/winhlp32/No.rc
| configure | diff1 | diff2 | blobhistory |
| configure.ac | diff1 | diff2 | blobhistory |
| dlls/riched20/caret.c | diff1 | diff2 | blobhistory |
| programs/winecfg/winecfg.c | diff1 | diff2 | blobhistory |