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
