← Back to branch summary

~daschuer/mixxx/features_clementine

~daschuer/mixxx/features_clementine

Viewing all changes in revision 2988.

Committer: RJ Ryan
Date: 2012-03-03 02:57:06 UTC
mfrom: (2837.3.23 1.10)
Revision ID: rryan@mit.edu-20120303025706-u4vqnu176yuqq2g3

Merging from lp:mixxx/1.10

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

mixxx/res/midi/Stanton-SCS3d-scripts.js

mixxx/src/SConscript

mixxx/src/basetrackplayer.cpp

mixxx/src/engine/bpmcontrol.cpp

mixxx/src/main.cpp

mixxx/src/mixxx.rc

mixxx/src/soundsourcecoreaudio.cpp

Show diffs side-by-side

added added

removed removed

mixxx/build/nsis/Mixxx.nsi

mixxx/res/midi/Stanton-SCS3d-scripts.js

mixxx/src/SConscript

mixxx/src/basetrackplayer.cpp

mixxx/src/engine/bpmcontrol.cpp

mixxx/src/main.cpp

mixxx/src/mixxx.rc

mixxx/src/soundsourcecoreaudio.cpp

Older »