| commit | f56737579e49aab5592a928d98d1e8c11d539368 | |
| author | Robert Shearman <rob@codeweavers.com> | |
| Mon, 26 Dec 2005 12:22:46 +0000 (26 13:22 +0100) | ||
| committer | Alexandre Julliard <julliard@winehq.org> | |
| Mon, 26 Dec 2005 12:22:46 +0000 (26 13:22 +0100) | ||
| tree | 194d3277035bd9bfaacac3c1292eb6b484488797 | treesnapshot (tar.gz zip) |
| parent | 93775adf75342a673367ed17de2225f38f9fa697 | commitdiff |
widl: Fix merge conflict.
| tools/widl/typegen.c | diffblobblamehistory |