On Fri, 2012-07-13 at 10:22 +0200, Max Kellermann wrote: > On 2012/07/12 19:43, Jurgen Kramer <gtmkra...@xs4all.nl> wrote: > > please pull: > > > > http://git.musicpd.org/cgit/gtmkramer/mpd.git/ > > I can't pull, because your branch conflicts with mine. Please rebase > before you start to work on something. OK, I keep that in mind next time.
> I have cherry-picked your top commit, thanks. > Appreciated, thanks! Jurgen ------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/ _______________________________________________ Musicpd-dev-team mailing list Musicpd-dev-team@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team