<html>
 <body>
  <div style="font-family: Verdana, Arial, Helvetica, Sans-Serif;">
   <table bgcolor="#f9f3c9" width="100%" cellpadding="8" style="border: 1px #c9c399 solid;">
    <tr>
     <td>
      This is an automatically generated e-mail. To reply, visit:
      <a href="http://git.reviewboard.kde.org/r/100088/">http://git.reviewboard.kde.org/r/100088/</a>
     </td>
    </tr>
   </table>
   <br />





<blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
 <p style="margin-top: 0;">On November 2nd, 2010, 8:44 p.m., <b>Ian Monroe</b> wrote:</p>
 <blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">With the latest changes, it looks good to me.</pre>
 </blockquote>




 <p>On November 2nd, 2010, 9:52 p.m., <b>Stefan Derkits</b> wrote:</p>
 <blockquote style="margin-left: 1em; border-left: 2px solid #d0d0d0; padding-left: 10px;">
  <pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">The Problem is that due to the Changes in SqlMeta it doesn&#39;t apply cleanly. But I&#39;m unable to read the &quot;Git Conflict Syntax&quot; :(</pre>
 </blockquote>








</blockquote>

<pre style="white-space: pre-wrap; white-space: -moz-pre-wrap; white-space: -pre-wrap; white-space: -o-pre-wrap; word-wrap: break-word;">Install k3diff, run git mergetool -t k3diff</pre>
<br />








<p>- Ian</p>


<br />
<p>On November 1st, 2010, 10:37 a.m., Stefan Derkits wrote:</p>






<table bgcolor="#fefadf" width="100%" cellspacing="0" cellpadding="8" style="background-image: url('http://git.reviewboard.kde.orgrb/images/review_request_box_top_bg.png'); background-position: left top; background-repeat: repeat-x; border: 1px black solid;">
 <tr>
  <td>

<div>Review request for Amarok.</div>
<div>By Stefan Derkits.</div>


<p style="color: grey;"><i>Updated 2010-11-01 10:37:10</i></p>




<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;">-) Created new Class with some Helper Functions
-) Changed MetaQueryWidget to use the QStringList that contains all Filetypes
-) Meta::SqlTrack.type() now gets it&#39;s Information from the Database instead of the FileExtension</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;">Tested in the App, found no wrong Behaviour</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>shared/FileType.h <span style="color: grey">(55c80b9)</span></li>

 <li>shared/FileType.cpp <span style="color: grey">(PRE-CREATION)</span></li>

 <li>src/CMakeLists.txt <span style="color: grey">(5f2ac9d)</span></li>

 <li>src/browsers/CollectionTreeItemModelBase.cpp <span style="color: grey">(c25549b)</span></li>

 <li>src/core-impl/collections/sqlcollection/CMakeLists.txt <span style="color: grey">(f530d67)</span></li>

 <li>src/core-impl/collections/sqlcollection/SqlMeta.h <span style="color: grey">(afdf937)</span></li>

 <li>src/core-impl/collections/sqlcollection/SqlMeta.cpp <span style="color: grey">(b1a0694)</span></li>

 <li>src/core-impl/collections/support/MemoryFilter.cpp <span style="color: grey">(c076494)</span></li>

 <li>src/widgets/MetaQueryWidget.cpp <span style="color: grey">(99e8993)</span></li>

 <li>tests/synchronization/CMakeLists.txt <span style="color: grey">(e5df2df)</span></li>

 <li>utilities/collectionscanner/CMakeLists.txt <span style="color: grey">(70c86d0)</span></li>

 <li>utilities/collectionscanner/CollectionScanner.cpp <span style="color: grey">(033ea84)</span></li>

</ul>

<p><a href="http://git.reviewboard.kde.org/r/100088/diff/" style="margin-left: 3em;">View Diff</a></p>




  </td>
 </tr>
</table>








  </div>
 </body>
</html>