Viewing all changes in revision 3294.
- Committer: Matt Mikolay
- Date: 2012-10-22 14:34:02 UTC
- mfrom: (3291.1.10 mixxx-trunk)
- Revision ID: mikolaym@yahoo.com-20121022143402-b1v67ffyx9hpz57b
Merging from lp:mixxx
- files added:
- mixxx/lib/hidapi-0.8.0-pre
- mixxx/lib/hidapi-0.8.0-pre/hidapi
- mixxx/lib/hidapi-0.8.0-pre/linux
- mixxx/lib/hidapi-0.8.0-pre/mac
- mixxx/lib/hidapi-0.8.0-pre/windows
- mixxx/lib/hidapi-0.8.0-pre/windows/ddk_build
- mixxx/res/shaders
- mixxx/src/controllers/bulk
- files removed:
- 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/waveform/shaders
- files renamed:
- mixxx/src/waveform/shaders/computemaxsignal.frag => mixxx/res/shaders/computemaxsignal.frag
- mixxx/src/waveform/shaders/filteredsignal.frag => mixxx/res/shaders/filteredsignal.frag
- mixxx/src/waveform/shaders/passthrough.vert => mixxx/res/shaders/passthrough.vert
- files modified:
- mixxx/SConstruct
expand all
collapse all
added
removed
