~ywwg/mixxx/master_sync

Viewing all changes in revision 3037.

  • 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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: