Merge playlist branch against trunk to date.

[disorder] / scripts / oggrename

diff --git a/scripts/oggrename b/scripts/oggrename
index 458a32ba94edf3b24262e3cbbe8c9f867b719476..9ab0c083a3e45716b105d8ee7190b533b660463d 100644 (file)
--- a/scripts/oggrename
+++ b/scripts/oggrename
@@ -3,20 +3,18 @@
 # This file is part of DisOrder
 # Copyright (C) 2006 Richard Kettlewell
 #
-# This program is free software; you can redistribute it and/or modify
+# 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
+# the Free Software Foundation, either version 3 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.
-#
+# 
+# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-# USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 use strict;
@@ -55,4 +53,3 @@ while(scalar %rename) {
     }
     die "stuck in a loop!\n" if !$worked;
 }
-# arch-tag:AU/Rh0oscz3GBqwzJYRy1w