Viewing all changes in revision 3293.
- Committer: Matt Mikolay
- Date: 2012-09-03 01:01:29 UTC
- mfrom: (3283.1.63 1.11)
- Revision ID: mikolaym@yahoo.com-20120903010129-qzd8fph90y1t6jyo
Merging from lp:mixxx/1.11
- files added:
- mixxx/res/controllers/DJ-Tech Mix-101.midi.xml
- files removed:
- mixxx/res/controllers/Traktor Kontrol F1 Samplers.cntrlr.xml
- files renamed:
- mixxx/res/controllers/EKS Otus.cntrlr.xml => mixxx/res/controllers/EKS Otus.hid.xml
- mixxx/res/controllers/HID Keyboard.cntrlr.xml.example => mixxx/res/controllers/HID Keyboard.hid.xml.example
- mixxx/res/controllers/HID Trackpad.cntrlr.xml.example => mixxx/res/controllers/HID Trackpad.hid.xml.example
- mixxx/res/controllers/Hercules DJ Console Mk2.cntrlr.xml => mixxx/res/controllers/Hercules DJ Console Mk2.hid.xml
- mixxx/res/controllers/Nintendo Wiimote.cntrlr.xml => mixxx/res/controllers/Nintendo Wiimote.hid.xml
- mixxx/res/controllers/Pioneer CDJ HID.cntrlr.xml => mixxx/res/controllers/Pioneer CDJ HID.hid.xml
- mixxx/res/controllers/Sony SixxAxis.cntrlr.xml => mixxx/res/controllers/Sony SixxAxis.hid.xml
- files modified:
- mixxx/build/depends.py
expand all
collapse all
added
removed
