Raymond Toy pushed to branch rtoy-update-clx-with-cmucl-fixes at cmucl / cmucl Commits: dded48c6 by Raymond Toy at 2018-12-16T17:44:37Z Update to upstream version 0.7.5-17-g1f2b6f3 This is a copy of the upstream version, unchanged. - - - - - 3688d64c by Raymond Toy at 2018-12-16T18:00:42Z Merge branch 'upstream-clx' into rtoy-update-clx-with-cmucl-fixes # Conflicts: # src/clx/dependent.lisp # src/clx/macros.lisp - - - - - 81e08b4c by Raymond Toy at 2018-12-16T18:05:02Z 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. - - - - - 28 changed files: - src/clx/CHANGES - src/clx/NEWS - src/clx/README-R5 - + src/clx/README.md - + src/clx/ci-doc-gh-pages.sh - src/clx/clx.asd - src/clx/debug/debug.lisp - src/clx/debug/describe.lisp - src/clx/debug/event-test.lisp - src/clx/debug/keytrans.lisp - src/clx/debug/trace.lisp - src/clx/debug/util.lisp - + src/clx/demo/image.lisp - + src/clx/demo/trapezoid.lisp - src/clx/dep-allegro.lisp - src/clx/dep-lispworks.lisp - src/clx/dep-openmcl.lisp - src/clx/dependent.lisp - src/clx/exclMakefile - src/clx/exclREADME - src/clx/excldep.c - + src/clx/extensions/composite.lisp - + src/clx/extensions/dbe.lisp - + src/clx/extensions/dri2.lisp - + src/clx/extensions/randr.lisp - src/clx/extensions/shape.lisp - + src/clx/extensions/xc-misc.lisp - src/clx/extensions/xrender.lisp The diff was not included because it is too large. View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/d10aa4a6e7edcf8e6254cb889... -- View it on GitLab: https://gitlab.common-lisp.net/cmucl/cmucl/compare/d10aa4a6e7edcf8e6254cb889... You're receiving this email because of your account on gitlab.common-lisp.net.