oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

pcm_buffer: eliminate merge conflict fallout

Browse Source
This commit is contained in:
Max Kellermann 2011-12-13 19:48:33 +01:00
parent 33232face9
commit 34aab116ae
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pcm_buffer.c
View File

@ -1,9 +1,5 @@
/* /*
<<<<<<< HEAD
* Copyright (C) 2003-2011 The Music Player Daemon Project * Copyright (C) 2003-2011 The Music Player Daemon Project
=======
* Copyright (C) 2003-2010 The Music Player Daemon Project
>>>>>>> v0.16.x
* http://www.musicpd.org * http://www.musicpd.org
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify