Viewing all changes in revision 3361.
- Committer: Steven Boswell
- Date: 2013-05-16 00:28:42 UTC
- mfrom: (3356.1.16 mixxx-trunk)
- Revision ID: ulatekh@yahoo.com-20130516002842-jlql015hx4y230nm
Merged with lp:mixxx
- files added:
- mixxx/src/encoder
- mixxx/src/engine/sidechain
- files renamed:
- mixxx/src/recording/encoder.cpp => mixxx/src/encoder/encoder.cpp
- mixxx/src/recording/encoder.h => mixxx/src/encoder/encoder.h
- mixxx/src/engine/engineabstractrecord.h => mixxx/src/encoder/encodercallback.h
- mixxx/src/recording/encodermp3.cpp => mixxx/src/encoder/encodermp3.cpp
- mixxx/src/recording/encodermp3.h => mixxx/src/encoder/encodermp3.h
- mixxx/src/recording/encodervorbis.cpp => mixxx/src/encoder/encodervorbis.cpp
- mixxx/src/recording/encodervorbis.h => mixxx/src/encoder/encodervorbis.h
- mixxx/src/recording/enginerecord.cpp => mixxx/src/engine/sidechain/enginerecord.cpp
- mixxx/src/recording/enginerecord.h => mixxx/src/engine/sidechain/enginerecord.h
- mixxx/src/engine/engineshoutcast.cpp => mixxx/src/engine/sidechain/engineshoutcast.cpp
- mixxx/src/engine/engineshoutcast.h => mixxx/src/engine/sidechain/engineshoutcast.h
- mixxx/src/engine/enginesidechain.cpp => mixxx/src/engine/sidechain/enginesidechain.cpp
- mixxx/src/engine/enginesidechain.h => mixxx/src/engine/sidechain/enginesidechain.h
- files modified:
- mixxx/Mixxx-Manual.pdf
- mixxx/res/controllers/Vestax VCI-300.midi.xml *
- mixxx/res/controllers/Vestax-VCI-300-scripts.js *
- mixxx/res/skins/Outline1024x600-Netbook/CHANGELOG.txt *
- mixxx/res/skins/Outline1024x600-Netbook/skin.xml *
- mixxx/res/skins/Outline1024x768-XGA/CHANGELOG.txt *
- mixxx/res/skins/Outline1024x768-XGA/skin.xml *
- mixxx/res/skins/Outline800x480-WVGA/skin.xml *
expand all
collapse all
added
removed
