← Back to branch summary

~hile/mixxx/hotplug

~hile/mixxx/hotplug

Viewing all changes in revision 3290.

Committer: RJ Ryan
Date: 2012-07-20 00:31:58 UTC
mfrom: (3283.1.38 1.11)
Revision ID: rryan@mit.edu-20120720003158-9fhwnbd43xyg1woo

Merging from lp:mixxx/1.11

files modified:
mixxx/build/nsis/Mixxx.nsi

mixxx/src/library/baseplaylistfeature.cpp

mixxx/src/library/baseplaylistfeature.h

mixxx/src/library/browse/foldertreemodel.cpp

mixxx/src/library/browse/foldertreemodel.h

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratefeature.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/soundmanager.cpp

Show diffs side-by-side

added added

removed removed

mixxx/build/nsis/Mixxx.nsi

mixxx/src/library/baseplaylistfeature.cpp

mixxx/src/library/baseplaylistfeature.h

mixxx/src/library/browse/foldertreemodel.cpp

mixxx/src/library/browse/foldertreemodel.h

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratefeature.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/soundmanager.cpp

Older »