diff options
author | Earnie Boyd <earnie@users.sf.net> | 2002-01-25 16:13:55 +0300 |
---|---|---|
committer | Earnie Boyd <earnie@users.sf.net> | 2002-01-25 16:13:55 +0300 |
commit | d4b5d8fda2d99ca39ee147bff592c0f84a0249d5 (patch) | |
tree | 5110e49df0ddc51d008e828056580d86cacde73c /etc | |
parent | b6d314495b66f99779d02953c9e4a5da622ff600 (diff) |
* include/winnt.h: Remove merge conflict.
Diffstat (limited to 'etc')
0 files changed, 0 insertions, 0 deletions