[pulseaudio-commits] r2178 - /branches/prepare-0.9.10/src/modules/bt-proximity-helper.c

[svnmailer-noreply at 0pointer.de]

Author: lennart
Date: Fri Mar 28 00:41:34 2008
New Revision: 2178

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=2178&root=pulseaudio&view=rev
Log:
merge r2146 from trunk

Modified:
    branches/prepare-0.9.10/src/modules/bt-proximity-helper.c

Modified: branches/prepare-0.9.10/src/modules/bt-proximity-helper.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/branches/prepare-0.9.10/src/modules/bt-proximity-helper.c?rev=2178&root=pulseaudio&r1=2177&r2=2178&view=diff
==============================================================================
--- branches/prepare-0.9.10/src/modules/bt-proximity-helper.c (original)
+++ branches/prepare-0.9.10/src/modules/bt-proximity-helper.c Fri Mar 28 00:41:34 2008
@@ -1,34 +1,28 @@
 /* $Id$ */
-
-/***
-  This file is part of PulseAudio.
-
-  Copyright 2007 Lennart Poettering
-
-  PulseAudio is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
-  or (at your option) any later version.
-
-  PulseAudio is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with PulseAudio; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-  USA.
-***/
 
 /*
  * Small SUID helper that allows us to ping a BT device. Borrows
- * heavily from bluez-utils' l2ping, which is licensed as GPL2+, too
+ * heavily from bluez-utils' l2ping, which is licensed as GPL2+
  * and comes with a copyright like this:
  *
  *  Copyright (C) 2000-2001  Qualcomm Incorporated
  *  Copyright (C) 2002-2003  Maxim Krasnyansky <maxk at qualcomm.com>
  *  Copyright (C) 2002-2007  Marcel Holtmann <marcel at holtmann.org>
+ *
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  */