« back to all changes in this revision
Viewing changes to mixxx/res/skins/Shade1024x600-Netbook/btn_nudge_up1_overdown.png
- Committer: RJ Ryan
- Date: 2013-06-04 00:41:29 UTC
- mfrom: (2890.22.101 mixxx)
- Revision ID: rryan@mixxx.org-20130604004129-8jjxkicsb3givu4a
Merging from lp:mixxx.
- files added:
- mixxx/build/osx/entitlements.plist
- mixxx/res/skins/DeereSamplegrid1280x800-WXGA
- mixxx/res/skins/DeereSamplegrid1280x800-WXGA/knobs
- mixxx/res/skins/DeereSamplegrid1280x800-WXGA/style
- mixxx/res/skins/Outline800x480-WVGA/knobs
- mixxx/res/skins/Outline800x480-WVGA/style
- mixxx/res/skins/Phoney1600x1200-UXGA/knobs
- mixxx/res/skins/Phoney1600x1200-UXGA/style
- mixxx/res/skins/Phoney1680x1050-WSXGA/knobs
- mixxx/res/skins/Phoney1680x1050-WSXGA/style
- mixxx/res/skins/PhoneyDark1600x1200-UXGA/knobs
- mixxx/res/skins/PhoneyDark1600x1200-UXGA/style
- mixxx/res/skins/PhoneyDark1680x1050-WSXGA/knobs
- mixxx/res/skins/PhoneyDark1680x1050-WSXGA/style
- mixxx/res/unused/skins
- mixxx/scripts
- mixxx/src/control
- mixxx/src/encoder
- mixxx/src/engine/sidechain
- mixxx/src/musicbrainz
- files removed:
- mixxx/res/controllers/BindableConfigKeys.txt
- files renamed:
- mixxx/res/controllers/Behringer-BCD20000-scripts.js => mixxx/res/controllers/Behringer-BCD2000-scripts.js
- mixxx/res/controllers/format.txt => mixxx/res/controllers/README.txt
- mixxx/res/controllers/Reloop TerminalMix4.js => mixxx/res/controllers/Reloop Terminal Mix 2-4.js
- mixxx/res/controllers/Reloop TerminalMix4.midi.xml => mixxx/res/controllers/Reloop Terminal Mix 2-4.midi.xml
- mixxx/res/keyboard/Old-pre1.10.0.kbd.cfg => mixxx/res/unused/keyboard/Old-pre1.10.0.kbd.cfg
- mixxx/res/skins/README.xsl => mixxx/res/unused/skins/README.xsl
- mixxx/res/skins/skin.xsl => mixxx/res/unused/skins/skin.xsl
- 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
- mixxx/src/engine/syncworker.cpp => mixxx/src/engine/syncworker.cpp.THIS
- mixxx/src/engine/syncworker.h => mixxx/src/engine/syncworker.h.THIS
- files modified:
- .bzrignore
added
removed
mixxx/res/skins/Shade1024x600-Netbook/btn_nudge_up1_overdown.png
