← Back to branch summary

~mixxxcontributors/mixxx/rmx2

« back to all changes in this revision

Viewing changes to mixxx/src/mixxx.cpp

  • Committer: jus
  • Date: 2013-02-23 11:28:48 UTC
  • mfrom: (3283.1.471 1.11)
  • Revision ID: s.brandt@mixxx.org-20130223112848-s9wvemk092qyuw4w
Merge from lp:mixxx/1.11

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/mixxx.cpp
424
424
            m_pPlayerManager->slotLoadToDeck(args.getMusicFiles().at(i), i+1);
425
425
        }
426
426
    }
 
427
 
 
428
#ifdef __PROMO__
427
429
    //Automatically load specially marked promotional tracks on first run
428
430
    if (bFirstRun || bUpgraded) {
429
431
        QList<TrackPointer> tracksToAutoLoad =
433
435
            m_pPlayerManager->slotLoadToDeck(tracksToAutoLoad.at(i)->getLocation(), i+1);
434
436
        }
435
437
    }
 
438
#endif
436
439
 
437
440
    initActions();
438
441
    initMenuBar();
1443
1446
"Markus H&auml;rer<br>"
1444
1447
"Andrey Smelov<br>"
1445
1448
"Scott Stewart<br>"
 
1449
"Nimatek<br>"
1446
1450
 
1447
1451
"</p>"
1448
1452
"<p align=\"center\"><b>%3</b></p>"