Yeah we should be doing merges more often to prevent this... thanks for taking a look! If there are any merges you don't understand don't hesitate to ask for help.
On Tue, 2015-06-16 at 08:38 +0200, Uwe Klotz wrote: > ...and of course also for the remaining modifications. More than I expected ;) > > On 06/16/2015 08:29 AM, Uwe Klotz wrote: > > 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 > > > > > ------------------------------------------------------------------------------ > _______________________________________________ > 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
