Viewing all changes in revision 2798.
- Committer: Varun Jewalikar
- Date: 2012-05-30 15:45:54 UTC
- mfrom: (2684.18.247 mixxx-trunk)
- Revision ID: mr.unwell2006@gmail.com-20120530154554-sh6i8m265v43gqtd
merge with the trunk
- files added:
- mixxx/build/protoc.py
- 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/lib/vamp-2.3
- mixxx/lib/vamp-2.3/src
- mixxx/lib/vamp-2.3/src/vamp-hostsdk
- mixxx/lib/vamp-2.3/src/vamp-sdk
- mixxx/lib/vamp-2.3/vamp
- mixxx/lib/vamp-2.3/vamp-hostsdk
- mixxx/lib/vamp-2.3/vamp-sdk
- mixxx/src/controllers
- mixxx/src/controllers/hid
- mixxx/src/controllers/midi
- mixxx/src/controllers/qtscript-bytearray
- mixxx/src/proto
- mixxx/src/shoutcast
- mixxx/src/waveform/renderers
- mixxx/src/waveform/shaders
- mixxx/src/waveform/widgets
- files removed:
- mixxx/lib/replaygain/replaygain_analysis.c
- 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/res/keyboard/Standard.kbd.cfg => mixxx/res/keyboard/en_US.kbd.cfg
- 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/dlgprefanalysers.cpp => mixxx/src/dlgprefbeats.cpp
- mixxx/src/dlgprefanalysers.h => mixxx/src/dlgprefbeats.h
- mixxx/src/dlgprefanalysersdlg.ui => mixxx/src/dlgprefbeatsdlg.ui
- mixxx/src/test/midiscriptenginetest.cpp => mixxx/src/test/controllerengine_test.cpp
- mixxx/src/beattools.cpp => mixxx/src/track/beatutils.cpp
- mixxx/src/beattools.h => mixxx/src/track/beatutils.h
- mixxx/src/waveform/waveformrenderbackground.cpp => mixxx/src/waveform/renderers/waveformrenderbackground.cpp
- mixxx/src/waveform/waveformrenderbackground.h => mixxx/src/waveform/renderers/waveformrenderbackground.h
- mixxx/src/waveform/waveformrenderbeat.cpp => mixxx/src/waveform/renderers/waveformrenderbeat.cpp
- mixxx/src/waveform/waveformrenderbeat.h => mixxx/src/waveform/renderers/waveformrenderbeat.h
- mixxx/src/waveform/waveformrendermark.cpp => mixxx/src/waveform/renderers/waveformrendermark.cpp
- mixxx/src/waveform/waveformrendermark.h => mixxx/src/waveform/renderers/waveformrendermark.h
- mixxx/src/waveform/waveformrendermarkrange.cpp => mixxx/src/waveform/renderers/waveformrendermarkrange.cpp
- mixxx/src/waveform/waveformrendermarkrange.h => mixxx/src/waveform/renderers/waveformrendermarkrange.h
- files modified:
- mixxx/SConstruct
expand all
collapse all
added
removed
mixxx/res/images/library/ic_library_history.png
mixxx/res/images/library/ic_library_history_current.png
mixxx/res/images/library/ic_library_setlog.png
mixxx/res/images/library/ic_library_setlog_current.png
mixxx/res/images/preferences/ic_preferences_controllers.png
mixxx/res/images/templates/ic_template_library_and_preferences.svg
