Created by Owen Williams on 2013-05-16 and last modified on 2013-05-16
Get this branch:
bzr branch lp:~ywwg/mixxx/atomic-master-sync
Only Owen Williams can upload to this branch. If you are Owen Williams please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owen Williams

Recent revisions

3373. By Owen Williams on 2013-05-16

Apply master sync and atomic-co patch

3372. By RJ Skerry-Ryan on 2013-05-15

Fix vamp-plugins SConscript to add the INTERNAL_VAMP_PATH to the include path correctly.

3370. By RJ Skerry-Ryan on 2013-05-15

Don't waste time formatting debug strings in MidiController::receive() unless debugging is on.

3369. By Owen Williams on 2013-05-14

If quantize is on, don't possibly choose the next beat because that will cause a seek (bzr native commit)

3368. By RJ Skerry-Ryan on 2013-05-14

Merging from lp:mixxx/1.11

3367. By Max Linke <email address hidden> on 2013-05-12

remove old BPM analyser code, Fix Bug #1179038

3366. By jus on 2013-05-09

Update translation templates for https://translations.launchpad.net/mixxx/trunk

3365. By RJ Skerry-Ryan on 2013-05-07

Remove Q_ASSERTs in EngineDeck. Support mono input (just in case).

3364. By RJ Skerry-Ryan on 2013-05-07

Minor nits from the vinyl-passthrough merge. Avoid values() calls on QHash and duplicate contains/lookups on QHashes in SoundManager. Move AudioInput connections into PlayerManager, do it for every VINYLCONTROL AudioInput. If we don't get any beyond 2 it shouldn't matter, they just wont get connected/disconnected/received.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.