« back to all changes in this revision
Viewing changes to mixxx/res/controllers/Hercules DJ Control MP3.midi.xml
- Committer: Keith Salisbury
- Date: 2012-05-06 13:44:20 UTC
- mfrom: (2994.1.100 mixxx-trunk)
- Revision ID: keithsalisbury@gmail.com-20120506134420-8k1dqq10aqmx0ecq
merge with trunk
- files added:
- mixxx/lib/hidapi-0.7.0
- mixxx/lib/hidapi-0.7.0/hidapi
- mixxx/lib/hidapi-0.7.0/linux
- mixxx/lib/hidapi-0.7.0/mac
- mixxx/lib/hidapi-0.7.0/windows
- mixxx/lib/hidapi-0.7.0/windows/ddk_build
- mixxx/src/controllers
- mixxx/src/controllers/hid
- mixxx/src/controllers/midi
- mixxx/src/controllers/qtscript-bytearray
- files removed:
- mixxx/res/html
- mixxx/src/midi
- files renamed:
- mixxx/res/midi/ => mixxx/res/controllers/
- mixxx/res/midi/midi-mappings-scripts.js => mixxx/res/controllers/common-controller-scripts.js
- mixxx/res/images/preferences/ic_preferences_controllers.png => mixxx/res/images/preferences/ic_preferences_midicontrollers.png
- mixxx/src/mixxxcontrol.cpp => mixxx/src/controllers/mixxxcontrol.cpp
- mixxx/src/mixxxcontrol.h => mixxx/src/controllers/mixxxcontrol.h
- mixxx/src/midi/pitchfilter.h => mixxx/src/controllers/pitchfilter.h
- mixxx/src/softtakeover.cpp => mixxx/src/controllers/softtakeover.cpp
- mixxx/src/softtakeover.h => mixxx/src/controllers/softtakeover.h
- mixxx/src/test/midiscriptenginetest.cpp => mixxx/src/test/controllerengine_test.cpp
- files modified:
- mixxx/SConstruct
added
removed
mixxx/res/controllers/Hercules DJ Control MP3.midi.xml
