Merge branch 'master' into newacpi

[chiark-utils.git] / cprogs / watershed.c

diff --git a/cprogs/watershed.c b/cprogs/watershed.c
index 82e17dce924f84624adfc8ce6e4ca31f6c12c83b..dfc9480b2057be7b9adc8385f5acf8eb492d63ab 100644 (file)
--- a/cprogs/watershed.c
+++ b/cprogs/watershed.c
@@ -3,6 +3,8 @@
  *             unnecessary runs of idempotent commands
  *
  * watershed is Copyright 2007 Canonical Ltd
+ * written by Ian Jackson <ian@davenant.greenend.org.uk>
+ * and this version now maintained as part of chiark-utils
  *
  *
  * This program is free software; you can redistribute it and/or modify
@@ -15,12 +17,10 @@
  * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- * See the file XXXXX for a full list of credits information (often
- * installed as XXXXX.
+ * You should have received a copy of the GNU General Public
+ * License along with this file; if not, consult the Free Software
+ * Foundation's website at www.fsf.org, or the GNU Project website at
+ * www.gnu.org.
  *
  */
 /*