« back to all changes in this revision
Viewing changes to mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/btn_vinylcontrol_cueing_off2.png
- Committer: Owen Williams
- Date: 2013-05-07 01:46:33 UTC
- mfrom: (2986.24.59 master_sync)
- Revision ID: owen-github@ywwg.com-20130507014633-3sw92nckzu37y4db
Merge branch 'DJO_t-biggerskin' into master_sync
Conflicts:
mixxx/res/skins/LateNight1280x800-4Deck-WXGA/skin.xml
Conflicts:
mixxx/res/skins/LateNight1280x800-4Deck-WXGA/skin.xml
- files added:
- mixxx/res/skins/LateNight1280x800-WXGA-4
- mixxx/res/skins/LateNight1280x800-WXGA-4/knobs
- mixxx/res/skins/LateNight1280x800-WXGA-4/style
- mixxx/res/skins/LateNight1920x1080
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/knobs
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/knobs/orig
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/knobs/resized
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/orig
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/resized
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/style
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/style/orig
- mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/style/resized
- mixxx/res/skins/LateNight1920x1080/knobs
- mixxx/res/skins/LateNight1920x1080/knobs/orig
- mixxx/res/skins/LateNight1920x1080/knobs/resized
- mixxx/res/skins/LateNight1920x1080/orig
- mixxx/res/skins/LateNight1920x1080/resized
- mixxx/res/skins/LateNight1920x1080/style
- mixxx/res/skins/LateNight1920x1080/style/orig
- mixxx/res/skins/LateNight1920x1080/style/resized
- mixxx/res/skins/Trancer-DJO-3
- mixxx/res/skins/Trancer-DJO-3-fullscreen
- files modified:
- mixxx/res/skins/Deere1280x800-WXGA/skin.xml
added
removed
mixxx/res/skins/LateNight1920x1080-4Deck-WXGA/btn_vinylcontrol_cueing_off2.png
