← Back to branch summary

~mixxxdevelopers/mixxx/features_multi-track

~mixxxdevelopers/mixxx/features_multi-track

Viewing all changes in revision 2982.

Committer: RJ Ryan
Date: 2012-01-07 06:23:03 UTC
mfrom: (2837.3.6 mixxx-1.10)
Revision ID: rryan@mit.edu-20120107062303-t3frj9pvngzu6chn

Merging from lp:mixxx/1.10

files modified:
mixxx/LICENSE

mixxx/README

mixxx/res/translations/mixxx.ts

mixxx/res/translations/mixxx/mixxx.pot

mixxx/src/defs_urls.h

mixxx/src/defs_version.h

mixxx/src/engine/bpmcontrol.cpp

mixxx/src/library/itunes/itunesplaylistmodel.cpp

mixxx/src/library/rhythmbox/rhythmboxplaylistmodel.cpp

mixxx/src/library/traktor/traktorplaylistmodel.cpp

mixxx/src/mixxx.cpp

Show diffs side-by-side

added added

removed removed

mixxx/res/translations/mixxx.ts

mixxx/res/translations/mixxx/mixxx.pot

mixxx/src/defs_urls.h

mixxx/src/defs_version.h

mixxx/src/engine/bpmcontrol.cpp

mixxx/src/library/itunes/itunesplaylistmodel.cpp

mixxx/src/library/rhythmbox/rhythmboxplaylistmodel.cpp

mixxx/src/library/traktor/traktorplaylistmodel.cpp

mixxx/src/mixxx.cpp

Older »