← Back to branch summary

~max-linke/mixxx/previewdeck

~max-linke/mixxx/previewdeck

Viewing all changes in revision 3021.

Committer: Max Linke
Date: 2012-06-03 14:37:44 UTC
mfrom: (2994.9.25 mixxx-trunk)
Revision ID: kain88@640x4-20120603143744-lhm7g01hmse348sv

merge from trunk

files added:
mixxx/build/debian/control.precise

mixxx/res/controllers/Behringer BCD2000.midi.xml

mixxx/res/controllers/Behringer-BCD20000-scripts.js

mixxx/res/controllers/Hercules DJ Console 4-Mx.midi.xml

mixxx/res/controllers/Hercules DJ Control AIR.midi.xml

mixxx/res/controllers/Hercules-DJ-Control-AIR-scripts.js

mixxx/res/controllers/Nintendo Wiimote.cntrlr.xml

mixxx/res/controllers/Nintendo Wiimote.hid.js

mixxx/res/controllers/Nintendo Wiimote.js

mixxx/res/controllers/Novation Dicer.midi.xml

mixxx/res/controllers/Novation-Dicer-scripts.js

mixxx/res/controllers/Numark DJ2Go.midi.xml

mixxx/res/controllers/Numark Mixtrack Pro.midi.xml

mixxx/res/controllers/Numark-DJ2Go-scripts.js

mixxx/res/controllers/Numark-Mixtrack-Pro-scripts.js

mixxx/res/controllers/Sony SixxAxis.hid.js

mixxx/src/controllers/controllerpresetinfo.cpp

mixxx/src/controllers/controllerpresetinfo.h

files modified:
mixxx/build/depends.py

mixxx/res/controllers/American-Audio-VMS4-scripts.js

mixxx/res/controllers/Denon MC3000.midi.xml

mixxx/res/controllers/Denon-MC3000-scripts.js

mixxx/res/controllers/EKS Otus.js

mixxx/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js

mixxx/res/controllers/Novation Launchpad.midi.xml

mixxx/res/controllers/Novation-Launchpad-scripts.js

mixxx/res/controllers/Numark MIXTRACK.midi.xml

mixxx/res/controllers/Numark-MixTrack-scripts.js

mixxx/res/controllers/common-controller-scripts.js

mixxx/res/controllers/common-hid-packet-parser.js

mixxx/src/analyserwaveform.cpp

mixxx/src/analyserwaveform.h

mixxx/src/controllers/controller.h

mixxx/src/controllers/controllerengine.cpp

mixxx/src/controllers/controllerengine.h

mixxx/src/controllers/controllermanager.cpp

mixxx/src/controllers/controllermanager.h

mixxx/src/controllers/controllerpreset.h

mixxx/src/controllers/dlgprefcontroller.cpp

mixxx/src/controllers/dlgprefcontroller.h

mixxx/src/controllers/dlgprefcontrollerdlg.ui

mixxx/src/controllers/hid/hidcontroller.cpp

mixxx/src/controllers/hid/hidcontroller.h

mixxx/src/controllers/midi/midicontroller.cpp

mixxx/src/controllers/midi/midicontroller.h

mixxx/src/controllers/softtakeover.cpp

mixxx/src/controllers/softtakeover.h

mixxx/src/dlgprefcontrols.cpp

mixxx/src/dlgprefcontrols.h

mixxx/src/dlgprefcontrolsdlg.ui

mixxx/src/dlgpreferences.cpp

mixxx/src/engine/enginepregain.cpp

mixxx/src/engine/enginevinylsoundemu.cpp

mixxx/src/library/stardelegate.cpp

mixxx/src/library/stareditor.cpp

mixxx/src/library/stareditor.h

mixxx/src/library/starrating.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.h

mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp

mixxx/src/waveform/waveform.cpp

mixxx/src/waveform/waveform.h

mixxx/src/waveform/waveformfactory.cpp

mixxx/src/waveform/waveformfactory.h

mixxx/src/waveform/waveformwidgetfactory.cpp

mixxx/src/waveform/waveformwidgetfactory.h

mixxx/src/widget/wlibrarytableview.cpp

mixxx/src/widget/woverview.cpp

mixxx/src/widget/woverview.h

mixxx/src/widget/wpushbutton.cpp

mixxx/src/widget/wtracktableview.cpp

mixxx/src/widget/wtracktableview.h

Show diffs side-by-side

added added

removed removed

mixxx/build/debian/control.precise

mixxx/build/depends.py

mixxx/res/controllers/American-Audio-VMS4-scripts.js

mixxx/res/controllers/Behringer BCD2000.midi.xml

mixxx/res/controllers/Behringer-BCD20000-scripts.js

mixxx/res/controllers/Denon MC3000.midi.xml

mixxx/res/controllers/Denon-MC3000-scripts.js

mixxx/res/controllers/EKS Otus.js

mixxx/res/controllers/Hercules DJ Console 4-Mx.midi.xml

mixxx/res/controllers/Hercules DJ Control AIR.midi.xml

mixxx/res/controllers/Hercules-DJ-Console-Mk2-hid-scripts.js

mixxx/res/controllers/Hercules-DJ-Control-AIR-scripts.js

mixxx/res/controllers/Nintendo Wiimote.cntrlr.xml

mixxx/res/controllers/Nintendo Wiimote.hid.js

mixxx/res/controllers/Nintendo Wiimote.js

mixxx/res/controllers/Novation Dicer.midi.xml

mixxx/res/controllers/Novation Launchpad.midi.xml

mixxx/res/controllers/Novation-Dicer-scripts.js

mixxx/res/controllers/Novation-Launchpad-scripts.js

mixxx/res/controllers/Numark DJ2Go.midi.xml

mixxx/res/controllers/Numark MIXTRACK.midi.xml

mixxx/res/controllers/Numark Mixtrack Pro.midi.xml

mixxx/res/controllers/Numark-DJ2Go-scripts.js

mixxx/res/controllers/Numark-MixTrack-scripts.js

mixxx/res/controllers/Numark-Mixtrack-Pro-scripts.js

mixxx/res/controllers/Sony SixxAxis.hid.js

mixxx/res/controllers/common-controller-scripts.js

mixxx/res/controllers/common-hid-packet-parser.js

mixxx/src/analyserwaveform.cpp

mixxx/src/analyserwaveform.h

mixxx/src/controllers/controller.h

mixxx/src/controllers/controllerengine.cpp

mixxx/src/controllers/controllerengine.h

mixxx/src/controllers/controllermanager.cpp

mixxx/src/controllers/controllermanager.h

mixxx/src/controllers/controllerpreset.h

mixxx/src/controllers/controllerpresetinfo.cpp

mixxx/src/controllers/controllerpresetinfo.h

mixxx/src/controllers/dlgprefcontroller.cpp

mixxx/src/controllers/dlgprefcontroller.h

mixxx/src/controllers/dlgprefcontrollerdlg.ui

mixxx/src/controllers/hid/hidcontroller.cpp

mixxx/src/controllers/hid/hidcontroller.h

mixxx/src/controllers/midi/midicontroller.cpp

mixxx/src/controllers/midi/midicontroller.h

mixxx/src/controllers/softtakeover.cpp

mixxx/src/controllers/softtakeover.h

mixxx/src/dlgprefcontrols.cpp

mixxx/src/dlgprefcontrols.h

mixxx/src/dlgprefcontrolsdlg.ui

mixxx/src/dlgpreferences.cpp

mixxx/src/engine/enginepregain.cpp

mixxx/src/engine/enginevinylsoundemu.cpp

mixxx/src/library/stardelegate.cpp

mixxx/src/library/stareditor.cpp

mixxx/src/library/stareditor.h

mixxx/src/library/starrating.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.cpp

mixxx/src/waveform/renderers/glslwaveformrenderersignal.h

mixxx/src/waveform/renderers/glwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/glwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/qtwaveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/qtwaveformrenderersimplesignal.cpp

mixxx/src/waveform/renderers/waveformrendererfilteredsignal.cpp

mixxx/src/waveform/renderers/waveformwidgetrenderer.cpp

mixxx/src/waveform/waveform.cpp

mixxx/src/waveform/waveform.h

mixxx/src/waveform/waveformfactory.cpp

mixxx/src/waveform/waveformfactory.h

mixxx/src/waveform/waveformwidgetfactory.cpp

mixxx/src/waveform/waveformwidgetfactory.h

Older »