-
Raymond Toy authored
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.
81e08b4c