Master is again head up with 1.12 Am 25.10.2015 um 03:45 schrieb Owen Williams: > I really don't know enough about the recent changes to do this merge > right, can someone please step in and do this? > > owen > > On Thu, 2015-10-15 at 07:48 +0200, Uwe Klotz wrote: >> Daniel has already migrated his changes for Windows (UTF-16/wchar_t) from >> 1.12 to master separately. It should be safe if we just choose the >> SoundSource and TagLib files from master in case of conflicts. >> >> On 10/15/2015 02:05 AM, Owen Williams wrote: >>> Can someone carefully do a merge from 1.12 into trunk? There are a >>> bunch of conflicts with the soundsource files. >>> >>> We have to be very careful making changes to soundsource files because >>> there has been so much divergence since the backend change. Until the >>> release we need to keep incorporating 1.12 bugfixes into master. >>> >>> (Speaking of the release, we're just waiting on the shoutcast fix and >>> then we'll do it. It sounds like there's a freeze on shutdown we need >>> to fix, but otherwise it's mostly good) >>> >>> >>> ------------------------------------------------------------------------------ >>> _______________________________________________ >>> 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
