Conflicts: Xi/xichangehierarchy.c Small conflict with the patch from Xi: don't use devices after removing them Was easily resolved by hand. Signed-off-by: Keith Packard <keithp@keithp.com> |
||
|---|---|---|
| .. | ||
| Makefile.am | ||
| cursor.c | ||
| region.c | ||
| saveset.c | ||
| select.c | ||
| xfixes.c | ||
| xfixes.h | ||
| xfixesint.h | ||