~ywwg/mixxx/master_sync

« back to all changes in this revision

Viewing changes to mixxx/res/skins/Deere1280x800-WXGA/skin.xml

  • 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

Show diffs side-by-side

added added

removed removed

Lines of Context:
4294
4294
 
4295
4295
                        <!--
4296
4296
                        **********************************************
4297
 
                        Button - Quantize
 
4297
                        Button - Quantize <ConfigKey>[Channel1],quantize</ConfigKey>
4298
4298
                        **********************************************
4299
4299
                        -->
4300
4300
                        <PushButton>