← Back to branch summary

~dan-lin/mixxx/features_qml

~dan-lin/mixxx/features_qml

Viewing all changes in revision 2992.

Committer: RJ Ryan
Date: 2012-03-14 05:20:20 UTC
mfrom: (2837.3.31 mixxx-1.10)
Revision ID: rryan@mit.edu-20120314052020-m1hi5dmgm694n1qg

Merging from lp:mixxx/1.10

files modified:
mixxx/src/dlgprefmidibindings.cpp

mixxx/src/library/browse/browsethread.cpp

mixxx/src/library/browse/browsethread.h

mixxx/src/library/browse/foldertreemodel.cpp

mixxx/src/library/dao/cratedao.cpp

mixxx/src/main.cpp

mixxx/src/mixxx.cpp

mixxx/src/recording/enginerecord.cpp

mixxx/src/recording/enginerecord.h

mixxx/src/widget/wsearchlineedit.cpp

Show diffs side-by-side

added added

removed removed

mixxx/src/dlgprefmidibindings.cpp

mixxx/src/library/browse/browsethread.cpp

mixxx/src/library/browse/browsethread.h

mixxx/src/library/browse/foldertreemodel.cpp

mixxx/src/library/dao/cratedao.cpp

mixxx/src/main.cpp

mixxx/src/mixxx.cpp

mixxx/src/recording/enginerecord.cpp

mixxx/src/recording/enginerecord.h

Older »