<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Raymond Toy pushed to branch rtoy-update-clx-with-cmucl-fixes
at <a href="https://gitlab.common-lisp.net/cmucl/cmucl">cmucl / cmucl</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://gitlab.common-lisp.net/cmucl/cmucl/commit/dded48c6a9b7cd7a3f5ac066f6744405cff34a59">dded48c6</a></strong>
<div>
<span>by Raymond Toy</span>
<i>at 2018-12-16T17:44:37Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Update to upstream version 0.7.5-17-g1f2b6f3
This is a copy of the upstream version, unchanged.
</pre>
</li>
<li>
<strong><a href="https://gitlab.common-lisp.net/cmucl/cmucl/commit/3688d64cb7ec151b8b1f473a332e04ee91223d06">3688d64c</a></strong>
<div>
<span>by Raymond Toy</span>
<i>at 2018-12-16T18:00:42Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">Merge branch 'upstream-clx' into rtoy-update-clx-with-cmucl-fixes
# Conflicts:
# src/clx/dependent.lisp
# src/clx/macros.lisp
</pre>
</li>
<li>
<strong><a href="https://gitlab.common-lisp.net/cmucl/cmucl/commit/81e08b4c44f842db6e07cf648869d8d6dfc21ca1">81e08b4c</a></strong>
<div>
<span>by Raymond Toy</span>
<i>at 2018-12-16T18:05:02Z</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">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.
</pre>
</li>
</ul>
<h4>28 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#2a45487df61739b83d3d7fcb2141222f78aa2251">
src/clx/CHANGES
</a>
</li>
<li class="file-stats">
<a href="#c96c97a30b163f71108ac28fcc720af258918cfa">
src/clx/NEWS
</a>
</li>
<li class="file-stats">
<a href="#5a5e5102703639157b8ddc985d620bc524929936">
src/clx/README-R5
</a>
</li>
<li class="file-stats">
<a href="#585dc3aabdadd4c76e6fc257c9585e3b19737fea">
<span class="new-file">
+
src/clx/README.md
</span>
</a>
</li>
<li class="file-stats">
<a href="#6806ada30e43924643c66168e4c0efc87e531f01">
<span class="new-file">
+
src/clx/ci-doc-gh-pages.sh
</span>
</a>
</li>
<li class="file-stats">
<a href="#f11127da032698e378fcf5562a954407ede9a314">
src/clx/clx.asd
</a>
</li>
<li class="file-stats">
<a href="#4d469e189db8770eae8f108766b023416fb370cd">
src/clx/debug/debug.lisp
</a>
</li>
<li class="file-stats">
<a href="#c7ab5dfb439a6c2d0f91406f783fe7248a1ff447">
src/clx/debug/describe.lisp
</a>
</li>
<li class="file-stats">
<a href="#47ea37f96ce6bc2a07c43840466c9d38d78b46c9">
src/clx/debug/event-test.lisp
</a>
</li>
<li class="file-stats">
<a href="#5e1a41540272fc0bdd707ed3c096c1f102fac16b">
src/clx/debug/keytrans.lisp
</a>
</li>
<li class="file-stats">
<a href="#84e6c8ee31e4376a428490023881ca23db94d59f">
src/clx/debug/trace.lisp
</a>
</li>
<li class="file-stats">
<a href="#d5c247b6ea0d0e0f33d8d1ea469c2a831de603ee">
src/clx/debug/util.lisp
</a>
</li>
<li class="file-stats">
<a href="#b778b052eed00ec7f0d29ab84c840fd559fcfcb8">
<span class="new-file">
+
src/clx/demo/image.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#ee46416d821cb4ac3165076ed52016b534ef616d">
<span class="new-file">
+
src/clx/demo/trapezoid.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#3b68255f9b7e9f3f1b96ba5a6e1156e96602d925">
src/clx/dep-allegro.lisp
</a>
</li>
<li class="file-stats">
<a href="#d4dba97443e63ff42b09886f961fd7693711344c">
src/clx/dep-lispworks.lisp
</a>
</li>
<li class="file-stats">
<a href="#63df6791f2b19907979d757c67e0ca71fa28fd88">
src/clx/dep-openmcl.lisp
</a>
</li>
<li class="file-stats">
<a href="#b80bcf751ae2e3b043ec7d591b3b22327e74fada">
src/clx/dependent.lisp
</a>
</li>
<li class="file-stats">
<a href="#ba086a422e461775beb7851c65bd0e2ad0dd484c">
src/clx/exclMakefile
</a>
</li>
<li class="file-stats">
<a href="#213c18f2bc7c45e854721d1ff73758e940cdf0c2">
src/clx/exclREADME
</a>
</li>
<li class="file-stats">
<a href="#59872ae8041b0a001fad74d70d040a97a6f03ffe">
src/clx/excldep.c
</a>
</li>
<li class="file-stats">
<a href="#937f023f2523f9da72f75f74bd054c2f02b1b39e">
<span class="new-file">
+
src/clx/extensions/composite.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#5b6146ecd03754582bf519ed8e4f05b250ef4a9d">
<span class="new-file">
+
src/clx/extensions/dbe.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#059726ec91c5ee3b9d0009bfe924b6db171a0987">
<span class="new-file">
+
src/clx/extensions/dri2.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#ec64c77fac8580c66fc8f561d1042cb1e8bbb2cc">
<span class="new-file">
+
src/clx/extensions/randr.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#58c0738c6ed1525a88d5bbfd6a57e88e594ae507">
src/clx/extensions/shape.lisp
</a>
</li>
<li class="file-stats">
<a href="#227bc226426617903d8f5d23def7c930b7ee4dba">
<span class="new-file">
+
src/clx/extensions/xc-misc.lisp
</span>
</a>
</li>
<li class="file-stats">
<a href="#1a6a1f36b5caee02f7a7db434a28d0e191bfcdbb">
src/clx/extensions/xrender.lisp
</a>
</li>
</ul>
<h5>The diff was not included because it is too large.</h5>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777777;">
—
<br>
<a href="https://gitlab.common-lisp.net/cmucl/cmucl/compare/d10aa4a6e7edcf8e6254cb8897cdf4e38139c6d1...81e08b4c44f842db6e07cf648869d8d6dfc21ca1">View it on GitLab</a>.
<br>
You're receiving this email because of your account on gitlab.common-lisp.net.
If you'd like to receive fewer emails, you can
adjust your notification settings.
</p>
</div>
</body>
</html>