diff options
| author | Keith Packard <keithp@keithp.com> | 2012-12-19 12:09:31 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-12-19 12:09:31 -0800 |
| commit | 014a5c8a9d86f2f992183bff9106354fac2c3b0e (patch) | |
| tree | e848fd6eb03079d6e3e8b69ba1b4237066e23749 /dix/pixmap.c | |
| parent | f793b5fd3eb16a2ada130367c2ffebeede69a322 (diff) | |
| parent | 2eefa5d6e870c57ac6a5930883d8cfe3a3882a43 (diff) | |
Merge remote-tracking branch 'whot/barriers'
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>
Diffstat (limited to 'dix/pixmap.c')
0 files changed, 0 insertions, 0 deletions