diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2011-09-22 17:12:45 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2011-09-22 17:12:45 +1000 |
| commit | 82adee7f82251772ce54760d4b380c95bfed8060 (patch) | |
| tree | 7255f650ff2c65afceea38ab349b5581947aad07 /os/strcasestr.c | |
| parent | cd7f86f7e52f16ba02649836540dfe2e46671dfd (diff) | |
| parent | 429f37979a32aa68b8d1b878df6e1c18729467f8 (diff) | |
Merge branch 'two-screen-coordinates' into nextnext-all
Conflicts:
hw/xfree86/common/xf86Xinput.c
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Diffstat (limited to 'os/strcasestr.c')
0 files changed, 0 insertions, 0 deletions