aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ. Alexander Treuman <jat@spatialrift.net>2006-07-14 19:37:45 +0000
committerJ. Alexander Treuman <jat@spatialrift.net>2006-07-14 19:37:45 +0000
commit2fa7125ccead7b1b97bc94a62b29135b9ddc5481 (patch)
tree6bd1128cf9f402fcd902d729ef83eeeec9dc7114
parent2a65e8667ddae35a16fb4b62951b5be190be20c4 (diff)
downloadmpd-2fa7125ccead7b1b97bc94a62b29135b9ddc5481.tar.gz
mpd-2fa7125ccead7b1b97bc94a62b29135b9ddc5481.tar.xz
mpd-2fa7125ccead7b1b97bc94a62b29135b9ddc5481.zip
Change shank's email address
git-svn-id: https://svn.musicpd.org/mpd/trunk@4333 09075e82-0dd4-0310-85a5-a0d7c8717e4f
Diffstat (limited to '')
-rw-r--r--AUTHORS2
-rw-r--r--configure.ac2
-rw-r--r--doc/mpd.12
-rw-r--r--src/ack.h2
-rw-r--r--src/audio.c2
-rw-r--r--src/audio.h2
-rw-r--r--src/audioOutput.c2
-rw-r--r--src/audioOutput.h2
-rw-r--r--src/audioOutputs/audioOutput_alsa.c2
-rw-r--r--src/audioOutputs/audioOutput_ao.c2
-rw-r--r--src/audioOutputs/audioOutput_mvp.c2
-rw-r--r--src/audioOutputs/audioOutput_oss.c2
-rw-r--r--src/audioOutputs/audioOutput_osx.c2
-rw-r--r--src/audioOutputs/audioOutput_pulse.c2
-rw-r--r--src/audioOutputs/audioOutput_shout.c2
-rw-r--r--src/buffer2array.c2
-rw-r--r--src/buffer2array.h2
-rw-r--r--src/charConv.c2
-rw-r--r--src/charConv.h2
-rw-r--r--src/command.c2
-rw-r--r--src/command.h2
-rw-r--r--src/conf.c2
-rw-r--r--src/conf.h2
-rw-r--r--src/dbUtils.c2
-rw-r--r--src/dbUtils.h2
-rw-r--r--src/decode.c2
-rw-r--r--src/decode.h2
-rw-r--r--src/directory.c2
-rw-r--r--src/directory.h2
-rw-r--r--src/inputPlugin.c2
-rw-r--r--src/inputPlugin.h2
-rw-r--r--src/inputPlugins/_flac_common.c2
-rw-r--r--src/inputPlugins/_flac_common.h2
-rw-r--r--src/inputPlugins/_ogg_common.c2
-rw-r--r--src/inputPlugins/_ogg_common.h2
-rw-r--r--src/inputPlugins/aac_plugin.c2
-rw-r--r--src/inputPlugins/audiofile_plugin.c2
-rw-r--r--src/inputPlugins/flac_plugin.c2
-rw-r--r--src/inputPlugins/mod_plugin.c2
-rw-r--r--src/inputPlugins/mp3_plugin.c2
-rw-r--r--src/inputPlugins/mp4_plugin.c2
-rw-r--r--src/inputPlugins/mpc_plugin.c2
-rw-r--r--src/inputPlugins/oggflac_plugin.c2
-rw-r--r--src/inputPlugins/oggvorbis_plugin.c2
-rw-r--r--src/inputStream.c2
-rw-r--r--src/inputStream.h2
-rw-r--r--src/inputStream_file.c2
-rw-r--r--src/inputStream_file.h2
-rw-r--r--src/inputStream_http.c2
-rw-r--r--src/inputStream_http.h2
-rw-r--r--src/interface.c2
-rw-r--r--src/interface.h2
-rw-r--r--src/list.c2
-rw-r--r--src/list.h2
-rw-r--r--src/listen.c2
-rw-r--r--src/listen.h2
-rw-r--r--src/log.c2
-rw-r--r--src/log.h2
-rw-r--r--src/ls.c2
-rw-r--r--src/ls.h2
-rw-r--r--src/main.c4
-rw-r--r--src/metadataChunk.c2
-rw-r--r--src/metadataChunk.h2
-rw-r--r--src/mpd_types.h2
-rw-r--r--src/myfprintf.c2
-rw-r--r--src/myfprintf.h2
-rw-r--r--src/outputBuffer.c2
-rw-r--r--src/outputBuffer.h2
-rw-r--r--src/path.c2
-rw-r--r--src/path.h2
-rw-r--r--src/pcm_utils.c2
-rw-r--r--src/pcm_utils.h2
-rw-r--r--src/permission.c2
-rw-r--r--src/permission.h2
-rw-r--r--src/player.c2
-rw-r--r--src/player.h2
-rw-r--r--src/playerData.c2
-rw-r--r--src/playerData.h2
-rw-r--r--src/playlist.c2
-rw-r--r--src/playlist.h2
-rw-r--r--src/replayGain.c2
-rw-r--r--src/replayGain.h2
-rw-r--r--src/sig_handlers.c2
-rw-r--r--src/sig_handlers.h2
-rw-r--r--src/signal_check.c2
-rw-r--r--src/signal_check.h2
-rw-r--r--src/song.c2
-rw-r--r--src/song.h2
-rw-r--r--src/stats.c2
-rw-r--r--src/stats.h2
-rw-r--r--src/tag.c2
-rw-r--r--src/tag.h2
-rw-r--r--src/tagTracker.c2
-rw-r--r--src/tagTracker.h2
-rw-r--r--src/tree.c2
-rw-r--r--src/tree.h2
-rw-r--r--src/utf8.c2
-rw-r--r--src/utf8.h2
-rw-r--r--src/utils.c2
-rw-r--r--src/utils.h2
-rw-r--r--src/volume.c2
-rw-r--r--src/volume.h2
102 files changed, 103 insertions, 103 deletions
diff --git a/AUTHORS b/AUTHORS
index 10c8966ab..f7a147ee5 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,4 @@
-Developer -> Warren Dukes <shank@mercury.chem.pitt.edu>
+Developer -> Warren Dukes <warren.dukes@gmail.com>
Developer -> tw-nym
audiofile support and command.c cleanup -> normalperson
setuid patch -> Nagilum
diff --git a/configure.ac b/configure.ac
index 5c2b0cfd5..9e0ee6b08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl AC_INIT(src/main.c)
dnl AM_INIT_AUTOMAKE(mpd, 0.10.0)
AC_PREREQ(2.52)
-AC_INIT(mpd, 0.12.0, shank@mercury.chem.pitt.edu)
+AC_INIT(mpd, 0.12.0, warren.dukes@gmail.com)
AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
dnl MAD wants this stuff
diff --git a/doc/mpd.1 b/doc/mpd.1
index 5741f6726..c1ddf1762 100644
--- a/doc/mpd.1
+++ b/doc/mpd.1
@@ -56,6 +56,6 @@ If you find a bug, please report it at
.br
<\fBhttp://www.musicpd.org/mantis/bug_report_page.php\fP>.
.SH AUTHORS
-Warren Dukes <warren.dukes __AT__ gmail.com>
+Warren Dukes <warren.dukes@gmail.com>
Special thanks to all the people that provided feedback and patches.
diff --git a/src/ack.h b/src/ack.h
index e5cc98be0..a82b508b2 100644
--- a/src/ack.h
+++ b/src/ack.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio.c b/src/audio.c
index e2e14a010..d0cd53da3 100644
--- a/src/audio.c
+++ b/src/audio.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audio.h b/src/audio.h
index c678dacc6..810f36110 100644
--- a/src/audio.h
+++ b/src/audio.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutput.c b/src/audioOutput.c
index 8282ffb26..fea4609a6 100644
--- a/src/audioOutput.c
+++ b/src/audioOutput.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutput.h b/src/audioOutput.h
index 87e91f678..870a4760f 100644
--- a/src/audioOutput.h
+++ b/src/audioOutput.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutputs/audioOutput_alsa.c b/src/audioOutputs/audioOutput_alsa.c
index 080e4ccd3..4484d2ca4 100644
--- a/src/audioOutputs/audioOutput_alsa.c
+++ b/src/audioOutputs/audioOutput_alsa.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutputs/audioOutput_ao.c b/src/audioOutputs/audioOutput_ao.c
index 1df7a5f3e..8251eeb21 100644
--- a/src/audioOutputs/audioOutput_ao.c
+++ b/src/audioOutputs/audioOutput_ao.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutputs/audioOutput_mvp.c b/src/audioOutputs/audioOutput_mvp.c
index 0b4c55f42..89331ec6d 100644
--- a/src/audioOutputs/audioOutput_mvp.c
+++ b/src/audioOutputs/audioOutput_mvp.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* Media MVP audio output based on code from MVPMC project:
diff --git a/src/audioOutputs/audioOutput_oss.c b/src/audioOutputs/audioOutput_oss.c
index 3f11adb0c..02403124e 100644
--- a/src/audioOutputs/audioOutput_oss.c
+++ b/src/audioOutputs/audioOutput_oss.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* OSS audio output (c) 2004, 2005, 2006 by Eric Wong <eric@petta-tech.com>
diff --git a/src/audioOutputs/audioOutput_osx.c b/src/audioOutputs/audioOutput_osx.c
index 8b0f5a9a6..87aed6e45 100644
--- a/src/audioOutputs/audioOutput_osx.c
+++ b/src/audioOutputs/audioOutput_osx.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutputs/audioOutput_pulse.c b/src/audioOutputs/audioOutput_pulse.c
index d2a794429..9baea5b68 100644
--- a/src/audioOutputs/audioOutput_pulse.c
+++ b/src/audioOutputs/audioOutput_pulse.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/audioOutputs/audioOutput_shout.c b/src/audioOutputs/audioOutput_shout.c
index b1586f6be..889166903 100644
--- a/src/audioOutputs/audioOutput_shout.c
+++ b/src/audioOutputs/audioOutput_shout.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/buffer2array.c b/src/buffer2array.c
index 7b1a6c7bf..0d8170260 100644
--- a/src/buffer2array.c
+++ b/src/buffer2array.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/buffer2array.h b/src/buffer2array.h
index 8593806ee..fdb7d90a8 100644
--- a/src/buffer2array.h
+++ b/src/buffer2array.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/charConv.c b/src/charConv.c
index 2ffe9e43a..68ea3e357 100644
--- a/src/charConv.c
+++ b/src/charConv.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/charConv.h b/src/charConv.h
index 8322cdfd9..e541eae69 100644
--- a/src/charConv.h
+++ b/src/charConv.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/command.c b/src/command.c
index d2ed365a9..ea7d0913b 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/command.h b/src/command.h
index 44d93bed0..2f025f3b1 100644
--- a/src/command.h
+++ b/src/command.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/conf.c b/src/conf.c
index 72cabfd78..cbf94bdd7 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/conf.h b/src/conf.h
index 4eaa1f612..90811e4af 100644
--- a/src/conf.h
+++ b/src/conf.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/dbUtils.c b/src/dbUtils.c
index c8a0dc81e..ecc8b8878 100644
--- a/src/dbUtils.c
+++ b/src/dbUtils.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/dbUtils.h b/src/dbUtils.h
index cdcdf74bf..9a87d7080 100644
--- a/src/dbUtils.h
+++ b/src/dbUtils.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/decode.c b/src/decode.c
index ae5d050b0..031d6dcde 100644
--- a/src/decode.c
+++ b/src/decode.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/decode.h b/src/decode.h
index 2f43f3aae..f0c4e4367 100644
--- a/src/decode.h
+++ b/src/decode.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/directory.c b/src/directory.c
index b4b021078..373c2dc94 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/directory.h b/src/directory.h
index 037477836..361e265ac 100644
--- a/src/directory.h
+++ b/src/directory.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugin.c b/src/inputPlugin.c
index e3d080792..55dcf01e4 100644
--- a/src/inputPlugin.c
+++ b/src/inputPlugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugin.h b/src/inputPlugin.h
index 8d538ad74..b7de1ca96 100644
--- a/src/inputPlugin.h
+++ b/src/inputPlugin.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/_flac_common.c b/src/inputPlugins/_flac_common.c
index 8b393c2d2..84b54ebef 100644
--- a/src/inputPlugins/_flac_common.c
+++ b/src/inputPlugins/_flac_common.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* Common data structures and functions used by FLAC and OggFLAC
diff --git a/src/inputPlugins/_flac_common.h b/src/inputPlugins/_flac_common.h
index 336c869f6..88fa4da58 100644
--- a/src/inputPlugins/_flac_common.h
+++ b/src/inputPlugins/_flac_common.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* Common data structures and functions used by FLAC and OggFLAC
diff --git a/src/inputPlugins/_ogg_common.c b/src/inputPlugins/_ogg_common.c
index 3e8d209a3..1f1012cd3 100644
--- a/src/inputPlugins/_ogg_common.c
+++ b/src/inputPlugins/_ogg_common.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC)
diff --git a/src/inputPlugins/_ogg_common.h b/src/inputPlugins/_ogg_common.h
index 5c9a4f8a6..aebb75128 100644
--- a/src/inputPlugins/_ogg_common.h
+++ b/src/inputPlugins/_ogg_common.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* Common functions used for Ogg data streams (Ogg-Vorbis and OggFLAC)
diff --git a/src/inputPlugins/aac_plugin.c b/src/inputPlugins/aac_plugin.c
index d62f8855e..33fb03dfb 100644
--- a/src/inputPlugins/aac_plugin.c
+++ b/src/inputPlugins/aac_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/audiofile_plugin.c b/src/inputPlugins/audiofile_plugin.c
index 92583ae45..0e52dc22f 100644
--- a/src/inputPlugins/audiofile_plugin.c
+++ b/src/inputPlugins/audiofile_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* libaudiofile (wave) support added by Eric Wong <normalperson@yhbt.net>
diff --git a/src/inputPlugins/flac_plugin.c b/src/inputPlugins/flac_plugin.c
index 583adc9f5..b3e5f6418 100644
--- a/src/inputPlugins/flac_plugin.c
+++ b/src/inputPlugins/flac_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/mod_plugin.c b/src/inputPlugins/mod_plugin.c
index 1415481ba..abdd08ba9 100644
--- a/src/inputPlugins/mod_plugin.c
+++ b/src/inputPlugins/mod_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/mp3_plugin.c b/src/inputPlugins/mp3_plugin.c
index 1e766f7e6..fcae642a2 100644
--- a/src/inputPlugins/mp3_plugin.c
+++ b/src/inputPlugins/mp3_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/mp4_plugin.c b/src/inputPlugins/mp4_plugin.c
index d3b2679b6..ae51ef987 100644
--- a/src/inputPlugins/mp4_plugin.c
+++ b/src/inputPlugins/mp4_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/mpc_plugin.c b/src/inputPlugins/mpc_plugin.c
index 9a07cbc73..30878fc16 100644
--- a/src/inputPlugins/mpc_plugin.c
+++ b/src/inputPlugins/mpc_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputPlugins/oggflac_plugin.c b/src/inputPlugins/oggflac_plugin.c
index 864c58367..41bdbc751 100644
--- a/src/inputPlugins/oggflac_plugin.c
+++ b/src/inputPlugins/oggflac_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* OggFLAC support (half-stolen from flac_plugin.c :))
diff --git a/src/inputPlugins/oggvorbis_plugin.c b/src/inputPlugins/oggvorbis_plugin.c
index 0dadb4d24..30034af69 100644
--- a/src/inputPlugins/oggvorbis_plugin.c
+++ b/src/inputPlugins/oggvorbis_plugin.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputStream.c b/src/inputStream.c
index abf43d792..a42a80e9c 100644
--- a/src/inputStream.c
+++ b/src/inputStream.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputStream.h b/src/inputStream.h
index 58175454e..f15be6cf9 100644
--- a/src/inputStream.h
+++ b/src/inputStream.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputStream_file.c b/src/inputStream_file.c
index 2c3ac97b3..96d846220 100644
--- a/src/inputStream_file.c
+++ b/src/inputStream_file.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputStream_file.h b/src/inputStream_file.h
index 4581952f9..5fa1329e1 100644
--- a/src/inputStream_file.h
+++ b/src/inputStream_file.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputStream_http.c b/src/inputStream_http.c
index b824d65b5..35aa9ea0c 100644
--- a/src/inputStream_http.c
+++ b/src/inputStream_http.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/inputStream_http.h b/src/inputStream_http.h
index cc01611ea..df55377b9 100644
--- a/src/inputStream_http.h
+++ b/src/inputStream_http.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/interface.c b/src/interface.c
index 429865240..eec294477 100644
--- a/src/interface.c
+++ b/src/interface.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/interface.h b/src/interface.h
index 4fecb1c4a..071274779 100644
--- a/src/interface.h
+++ b/src/interface.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/list.c b/src/list.c
index 4a5f4f712..dc32e9c55 100644
--- a/src/list.c
+++ b/src/list.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/list.h b/src/list.h
index 3730adf5e..6d5f5e0c7 100644
--- a/src/list.h
+++ b/src/list.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/listen.c b/src/listen.c
index 612c5c1b1..d6bd9558b 100644
--- a/src/listen.c
+++ b/src/listen.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/listen.h b/src/listen.h
index db8436c9e..d3c7927c2 100644
--- a/src/listen.h
+++ b/src/listen.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/log.c b/src/log.c
index ccacd1b2a..c35788bcf 100644
--- a/src/log.c
+++ b/src/log.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/log.h b/src/log.h
index 954199e8b..24a00faf2 100644
--- a/src/log.h
+++ b/src/log.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/ls.c b/src/ls.c
index aea510afd..dc36a888a 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/ls.h b/src/ls.h
index 93bd9807f..67614d62c 100644
--- a/src/ls.h
+++ b/src/ls.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/main.c b/src/main.c
index 515184855..6cfeb75e6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -127,7 +127,7 @@ void usage(char * argv[]) {
void version() {
LOG("mpd (MPD: Music Player Daemon) %s\n",VERSION);
LOG("\n");
- LOG("Copyright (C) 2003-2004 Warren Dukes <shank@mercury.chem.pitt.edu>\n");
+ LOG("Copyright (C) 2003-2004 Warren Dukes <warren.dukes@gmail.com>\n");
LOG("This is free software; see the source for copying conditions. There is NO\n");
LOG("warranty; not even MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n");
LOG("\n");
diff --git a/src/metadataChunk.c b/src/metadataChunk.c
index f0aaeb1c8..11962f73c 100644
--- a/src/metadataChunk.c
+++ b/src/metadataChunk.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/metadataChunk.h b/src/metadataChunk.h
index a427bbb0c..ff595f5c4 100644
--- a/src/metadataChunk.h
+++ b/src/metadataChunk.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/mpd_types.h b/src/mpd_types.h
index 629a49748..8fa6ed686 100644
--- a/src/mpd_types.h
+++ b/src/mpd_types.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/myfprintf.c b/src/myfprintf.c
index d64dd98d5..ee2bcc467 100644
--- a/src/myfprintf.c
+++ b/src/myfprintf.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/myfprintf.h b/src/myfprintf.h
index 1e7b36cc3..4bebbc712 100644
--- a/src/myfprintf.h
+++ b/src/myfprintf.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/outputBuffer.c b/src/outputBuffer.c
index 21cb4271f..d1f66f6dc 100644
--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/outputBuffer.h b/src/outputBuffer.h
index 96167af0f..81b1c5cbb 100644
--- a/src/outputBuffer.h
+++ b/src/outputBuffer.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/path.c b/src/path.c
index ef22128bf..dd402d1cc 100644
--- a/src/path.c
+++ b/src/path.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/path.h b/src/path.h
index 2c0be3914..43670f81b 100644
--- a/src/path.h
+++ b/src/path.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/pcm_utils.c b/src/pcm_utils.c
index 1b92f3df4..c7bcaa208 100644
--- a/src/pcm_utils.c
+++ b/src/pcm_utils.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/pcm_utils.h b/src/pcm_utils.h
index 9663bc5f9..a366c2a2d 100644
--- a/src/pcm_utils.h
+++ b/src/pcm_utils.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/permission.c b/src/permission.c
index 88f2ee551..3b6f7d142 100644
--- a/src/permission.c
+++ b/src/permission.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/permission.h b/src/permission.h
index b983a1ab7..7fec6f53e 100644
--- a/src/permission.h
+++ b/src/permission.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/player.c b/src/player.c
index 7b49547a0..54d20c9ae 100644
--- a/src/player.c
+++ b/src/player.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/player.h b/src/player.h
index 4da77d8ba..9d65a49fa 100644
--- a/src/player.h
+++ b/src/player.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/playerData.c b/src/playerData.c
index ef80aedc0..9e896ac9c 100644
--- a/src/playerData.c
+++ b/src/playerData.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/playerData.h b/src/playerData.h
index 76b4ca133..593a4c343 100644
--- a/src/playerData.h
+++ b/src/playerData.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/playlist.c b/src/playlist.c
index 1cdf7ca5e..c8f3ecf9a 100644
--- a/src/playlist.c
+++ b/src/playlist.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/playlist.h b/src/playlist.h
index 6efb56b7f..154ae55f2 100644
--- a/src/playlist.h
+++ b/src/playlist.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/replayGain.c b/src/replayGain.c
index 8ab93581d..b1c7e92d4 100644
--- a/src/replayGain.c
+++ b/src/replayGain.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* (c)2004 replayGain code by AliasMrJones
* This project's homepage is: http://www.musicpd.org
*
diff --git a/src/replayGain.h b/src/replayGain.h
index 912970cf8..789a25ce9 100644
--- a/src/replayGain.h
+++ b/src/replayGain.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* (c)2004 replayGain code by AliasMrJones
* This project's homepage is: http://www.musicpd.org
*
diff --git a/src/sig_handlers.c b/src/sig_handlers.c
index 4a2534462..a1bbb5379 100644
--- a/src/sig_handlers.c
+++ b/src/sig_handlers.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* (c) 2004 Nick Welch (mack@incise.org)
* This project's homepage is: http://www.musicpd.org
*
diff --git a/src/sig_handlers.h b/src/sig_handlers.h
index b68d8fd35..186ebb85f 100644
--- a/src/sig_handlers.h
+++ b/src/sig_handlers.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/signal_check.c b/src/signal_check.c
index 9b1096ff6..c06525350 100644
--- a/src/signal_check.c
+++ b/src/signal_check.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* (c)2004 by mackstann
* This project's homepage is: http://www.musicpd.org
*
diff --git a/src/signal_check.h b/src/signal_check.h
index 24e9ab73b..4ba72fbbf 100644
--- a/src/signal_check.h
+++ b/src/signal_check.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* (c)2004 by mackstann
* This project's homepage is: http://www.musicpd.org
*
diff --git a/src/song.c b/src/song.c
index fa105b3cf..94d7896c6 100644
--- a/src/song.c
+++ b/src/song.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/song.h b/src/song.h
index 9538b5ff3..f880adea5 100644
--- a/src/song.h
+++ b/src/song.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/stats.c b/src/stats.c
index 5162296be..2b7f6c218 100644
--- a/src/stats.c
+++ b/src/stats.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/stats.h b/src/stats.h
index 518dcc21a..d64ec90a5 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/tag.c b/src/tag.c
index 1543642a0..425b9742a 100644
--- a/src/tag.c
+++ b/src/tag.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/tag.h b/src/tag.h
index beffc4a9a..f0afba03d 100644
--- a/src/tag.h
+++ b/src/tag.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/tagTracker.c b/src/tagTracker.c
index 1b769b6b7..81824b49c 100644
--- a/src/tagTracker.c
+++ b/src/tagTracker.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/tagTracker.h b/src/tagTracker.h
index 301da29d1..7cb9fa49a 100644
--- a/src/tagTracker.h
+++ b/src/tagTracker.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/tree.c b/src/tree.c
index 388530609..74dcb48d9 100644
--- a/src/tree.c
+++ b/src/tree.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/tree.h b/src/tree.h
index d4beea35e..7976cac8c 100644
--- a/src/tree.h
+++ b/src/tree.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/utf8.c b/src/utf8.c
index 20981a67c..c0b7d694a 100644
--- a/src/utf8.c
+++ b/src/utf8.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/utf8.h b/src/utf8.h
index 62a609051..abc843e9d 100644
--- a/src/utf8.h
+++ b/src/utf8.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/utils.c b/src/utils.c
index eb370252e..6cc66e379 100644
--- a/src/utils.c
+++ b/src/utils.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/utils.h b/src/utils.h
index 902f6244d..ed22a9bb1 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/volume.c b/src/volume.c
index 8f5f05227..c3de951d1 100644
--- a/src/volume.c
+++ b/src/volume.c
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/volume.h b/src/volume.h
index 941cc28f7..0c0307da5 100644
--- a/src/volume.h
+++ b/src/volume.h
@@ -1,5 +1,5 @@
/* the Music Player Daemon (MPD)
- * (c)2003-2006 by Warren Dukes (shank@mercury.chem.pitt.edu)
+ * (c)2003-2006 by Warren Dukes (warren.dukes@gmail.com)
* This project's homepage is: http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify