I may provide a resolution of the merge conflicts for the SoundSourceProxy tests.
On 06/16/2015 03:13 AM, Owen Williams wrote: > Master and 1.12 have diverged to the point where they are not merging > cleanly. We need to make sure that bug fixes that go into 1.12 get back > into master. Can someone who is familiar with the soundsource changes > do a merge from 1.12 and resolve the conflicts? > > > ------------------------------------------------------------------------------ > _______________________________________________ > Get Mixxx, the #1 Free MP3 DJ Mixing software Today > http://mixxx.org > > > Mixxx-devel mailing list > Mixxx-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/mixxx-devel > ------------------------------------------------------------------------------ _______________________________________________ Get Mixxx, the #1 Free MP3 DJ Mixing software Today http://mixxx.org Mixxx-devel mailing list Mixxx-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mixxx-devel
