> On 2010-11-02 20:44:50, Ian Monroe wrote: > > With the latest changes, it looks good to me. > > Stefan Derkits wrote: > The Problem is that due to the Changes in SqlMeta it doesn't apply > cleanly. But I'm unable to read the "Git Conflict Syntax" :(
Install k3diff, run git mergetool -t k3diff - Ian ----------------------------------------------------------- This is an automatically generated e-mail. To reply, visit: http://git.reviewboard.kde.org/r/100088/#review273 ----------------------------------------------------------- On 2010-11-01 10:37:10, Stefan Derkits wrote: > > ----------------------------------------------------------- > This is an automatically generated e-mail. To reply, visit: > http://git.reviewboard.kde.org/r/100088/ > ----------------------------------------------------------- > > (Updated 2010-11-01 10:37:10) > > > Review request for Amarok. > > > Summary > ------- > > -) Created new Class with some Helper Functions > -) Changed MetaQueryWidget to use the QStringList that contains all Filetypes > -) Meta::SqlTrack.type() now gets it's Information from the Database instead > of the FileExtension > > > Diffs > ----- > > shared/FileType.h 55c80b9 > shared/FileType.cpp PRE-CREATION > src/CMakeLists.txt 5f2ac9d > src/browsers/CollectionTreeItemModelBase.cpp c25549b > src/core-impl/collections/sqlcollection/CMakeLists.txt f530d67 > src/core-impl/collections/sqlcollection/SqlMeta.h afdf937 > src/core-impl/collections/sqlcollection/SqlMeta.cpp b1a0694 > src/core-impl/collections/support/MemoryFilter.cpp c076494 > src/widgets/MetaQueryWidget.cpp 99e8993 > tests/synchronization/CMakeLists.txt e5df2df > utilities/collectionscanner/CMakeLists.txt 70c86d0 > utilities/collectionscanner/CollectionScanner.cpp 033ea84 > > Diff: http://git.reviewboard.kde.org/r/100088/diff > > > Testing > ------- > > Tested in the App, found no wrong Behaviour > > > Thanks, > > Stefan > >
_______________________________________________ Amarok-devel mailing list Amarok-devel@kde.org https://mail.kde.org/mailman/listinfo/amarok-devel
