<html>
<body>
<div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
<table bgcolor="#f9f3c9" width="100%" cellpadding="12" style="border: 1px #c9c399 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
This is an automatically generated e-mail. To reply, visit:
<a href="https://git.reviewboard.kde.org/r/127798/">https://git.reviewboard.kde.org/r/127798/</a>
</td>
</tr>
</table>
<br />
<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Not much to discuss here, I guess.
Bring it in and then fix the frameworks branch so it can be merged to master for business. :)</p></pre>
<br />
<p>- Frederik Schwarzer</p>
<br />
<p>On April 30th, 2016, 9:20 p.m. UTC, Martin Walch wrote:</p>
<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="12" style="border: 1px #888a85 solid; border-radius: 6px; -moz-border-radius: 6px; -webkit-border-radius: 6px;">
<tr>
<td>
<div>Review request for KDE Games.</div>
<div>By Martin Walch.</div>
<p style="color: grey;"><i>Updated April 30, 2016, 9:20 p.m.</i></p>
<div style="margin-top: 1.5em;">
<b style="color: #575012; font-size: 10pt;">Repository: </b>
lskat
</div>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Description </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">The master branch and the frameworks branch have diverged quite a lot in terms of diff size.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">This merges the changes from master into frameworks.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">There were a lot of conflicts. Hopefully I got them all right.</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Testing </h1>
<table width="100%" bgcolor="#ffffff" cellspacing="0" cellpadding="10" style="border: 1px solid #b8b5a0">
<tr>
<td>
<pre style="margin: 0; padding: 0; white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;"><p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Compiled against KF 5.21.</p>
<p style="padding: 0;text-rendering: inherit;margin: 0;line-height: inherit;white-space: inherit;">Crashes for me at runtime when initializing KCrash (how ironic), but this also happens with the current state of frameworks before the merge.</p></pre>
</td>
</tr>
</table>
<h1 style="color: #575012; font-size: 10pt; margin-top: 1.5em;">Diffs</b> </h1>
<ul style="margin-left: 3em; padding-left: 0;">
<li>README <span style="color: grey">(d6131309dfd7d2dc6bd60dad15c089d51c6184c0)</span></li>
<li>grafix/blue.desktop <span style="color: grey">(4562da0fcd008ce0b9a3b9bf8721a7eb9f2e1197)</span></li>
<li>grafix/oxygen.desktop <span style="color: grey">(f27d688e643fbb6c3777a8c3a8f3566a9d04a16a)</span></li>
<li>lskat.lsm <span style="color: grey">(bd90d94eb9a38625ee9de2c5bd5c95ccec4c29a6)</span></li>
<li>src/CMakeLists.txt <span style="color: grey">(fa57894bac06fc447c27fb113890c26f723c1fff)</span></li>
<li>src/abstractdisplay.h <span style="color: grey">(34ac418030a79fbd89d992e7199812370ad4cd18)</span></li>
<li>src/abstractdisplay.cpp <span style="color: grey">(b41f07eed9132e5a2fe26d268e93453088d0c5ef)</span></li>
<li>src/abstractengine.h <span style="color: grey">(6afd3aebe3ad114fc5b268fecb0cc486f414cd09)</span></li>
<li>src/abstractengine.cpp <span style="color: grey">(f41117b8b796ef9d3226f4eccf876408314cd5ec)</span></li>
<li>src/abstractinput.h <span style="color: grey">(501a8934a6165c6726ad746d751deee1726a1d46)</span></li>
<li>src/abstractinput.cpp <span style="color: grey">(c38f3aa6dcdb84c7de1cbfeff2326725e29c284a)</span></li>
<li>src/aiinput.h <span style="color: grey">(edaee483c23c5eb9ae4fe330e6558edc8e073c83)</span></li>
<li>src/aiinput.cpp <span style="color: grey">(a885e0067969fe2c671b2c1d9a64fe1091c8b4a8)</span></li>
<li>src/cardsprite.h <span style="color: grey">(074fab9abbbaf7312f916b7606e052753b4d2514)</span></li>
<li>src/cardsprite.cpp <span style="color: grey">(94bdd4946c0f5ffcfe764b9bc86bb94c9449b1cf)</span></li>
<li>src/config-src.h.cmake <span style="color: grey">(2375fd30d6de1ab735a4c1ad94774ccf403d7339)</span></li>
<li>src/config_two.h <span style="color: grey">(0ca5132491f1b49306d957cc1456d4304e84caea)</span></li>
<li>src/config_two.cpp <span style="color: grey">(f8a2a376d2802ef5a6cccd0ead7df8f80e8d76cd)</span></li>
<li>src/deck.h <span style="color: grey">(8bd9b4dfe552f14b00c43c20a7ae292fefab0975)</span></li>
<li>src/deck.cpp <span style="color: grey">(05e0bde17867b8a3dbf8a7f21d03e08066f002e8)</span></li>
<li>src/display_intro.h <span style="color: grey">(46f0a631ae399bddd12c7696619b930fee5dae67)</span></li>
<li>src/display_intro.cpp <span style="color: grey">(346b183bf3ff04b055dd5691a065f0b276076cf6)</span></li>
<li>src/display_two.h <span style="color: grey">(26cf2a3eea5253d1802c05d3c0d654249591dca3)</span></li>
<li>src/display_two.cpp <span style="color: grey">(0e1cb9061750db94592acadff451dc9b17800f8f)</span></li>
<li>src/engine_two.h <span style="color: grey">(0afedbf7b2265f23722c984fdb939ca921df9fd1)</span></li>
<li>src/engine_two.cpp <span style="color: grey">(a272ce4e8a8adaf8092c2e5655511c45ecac9b5a)</span></li>
<li>src/fromlibkdegames/cardcache.h <span style="color: grey">(e1f9b9dc79f1c8704ea812d7adfb8bb8bb5a420b)</span></li>
<li>src/fromlibkdegames/cardcache.cpp <span style="color: grey">(97104becc4c5fe7dcbe81a646c29fadf9c60fd85)</span></li>
<li>src/fromlibkdegames/cardcache_p.h <span style="color: grey">(effd6180c5104af6276e6e8e84e43dfac11b0be4)</span></li>
<li>src/fromlibkdegames/carddeckinfo.h <span style="color: grey">(57cd7b530e7192e9b016539b83098e491437da2d)</span></li>
<li>src/fromlibkdegames/carddeckinfo.cpp <span style="color: grey">(bfd255648fa4557b122dfc79df70d009a1929ca5)</span></li>
<li>src/fromlibkdegames/carddeckinfo_p.h <span style="color: grey">(b0e1f9f489ef7092628d7ebb8f26f808783ea882)</span></li>
<li>src/fromlibkdegames/kcarddialog.h <span style="color: grey">(155f6585b01014eb788a6f075d518032b297e014)</span></li>
<li>src/fromlibkdegames/kcarddialog.cpp <span style="color: grey">(be20e968b7ae8003b9e4ba3d2885670c4545f522)</span></li>
<li>src/gameview.h <span style="color: grey">(764f094c7f44996de540122b273ddcaf0bf225c0)</span></li>
<li>src/gameview.cpp <span style="color: grey">(c77d2efa4077b592dd199b7e65e03583a8035256)</span></li>
<li>src/lskat_debug.h <span style="color: grey">(ec11ade004cd391b6f58a5758b79f1834130a321)</span></li>
<li>src/lskat_debug.cpp <span style="color: grey">(c5225658ca3b43b5efa3ebfa23750c1288594cd8)</span></li>
<li>src/lskatglobal.h <span style="color: grey">(0c06da022a1053d1b55e7aa652cf1480a53676fc)</span></li>
<li>src/lskatui.rc <span style="color: grey">(4132ff86c4b823405ecbe903ed51d060a1fed7a9)</span></li>
<li>src/main.cpp <span style="color: grey">(4e0b60280fa82cb06dc0d53acb7f2328664129e4)</span></li>
<li>src/mainwindow.h <span style="color: grey">(2d82000a3640823ce5a9dcc38600769627b14e79)</span></li>
<li>src/mainwindow.cpp <span style="color: grey">(3f9ab57864ee6141aa771bc90784fd88e2f48008)</span></li>
<li>src/mouseinput.h <span style="color: grey">(aff1668d0ce91bbfac9263ecb6dadddf6cad772e)</span></li>
<li>src/mouseinput.cpp <span style="color: grey">(153c13a6c418a5782d2b703997d50d6c58ddf9b6)</span></li>
<li>src/namedialogwidget.h <span style="color: grey">(f8c803622d7ba7206f79e852e3c77aa564f7f510)</span></li>
<li>src/namedialogwidget.cpp <span style="color: grey">(f16ebba87c6bed91ca903b20bf9eea539d16d31a)</span></li>
<li>src/pixmapsprite.h <span style="color: grey">(ccd33541994393f0dea216fae58220209f9c6578)</span></li>
<li>src/pixmapsprite.cpp <span style="color: grey">(3371e21d0ad59b1ef380eb1a51d529de75db9726)</span></li>
<li>src/player.h <span style="color: grey">(e1ff42251c8c9d6335c21f25cdd687112879884a)</span></li>
<li>src/player.cpp <span style="color: grey">(9a4e1f5ee0a8e9d2229cf326644a1fb402592b44)</span></li>
<li>src/scoresprite.h <span style="color: grey">(d974e17d827713f545be6a6adedb6043c0d15d1a)</span></li>
<li>src/scoresprite.cpp <span style="color: grey">(31ee5d26ca63c27b0351198753b99482840747cd)</span></li>
<li>src/textsprite.h <span style="color: grey">(15cf431fd2aec239a31a9bc261900dd8a913afbd)</span></li>
<li>src/textsprite.cpp <span style="color: grey">(cc750e8fffdf5dd592f1c0923144e3c27ddaf8cc)</span></li>
<li>src/thememanager.h <span style="color: grey">(6aff19055266a04f7ec2fc0aa2bc8019e0c7f4b3)</span></li>
<li>src/thememanager.cpp <span style="color: grey">(c160005905499aa6c18aa6a3b1dfe69de714be4d)</span></li>
</ul>
<p><a href="https://git.reviewboard.kde.org/r/127798/diff/" style="margin-left: 3em;">View Diff</a></p>
</td>
</tr>
</table>
</div>
</body>
</html>