Commit 81e08b4c authored by Raymond Toy's avatar Raymond Toy

Update extensions with upstream

The merge with upstream had conflicts in extensions/shape.lisp and
extensions/xrender.lisp and the new files were added as shape.lisp~
upstream-clx and xrender.lisp~upstream-clx.

Just copy these files over the existing ones.
parent 3688d64c
Pipeline #668 failed with stage
in 27 minutes and 24 seconds
......@@ -107,7 +107,7 @@
(window window)
(int16 x-offset)
(int16 y-offset)
((or pixmap (member :none)) pixmap))))
((or (member :none) pixmap) pixmap))))
(defun shape-combine (window source-window
&key (kind :bounding)
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment