Merge remote branch 'upstream/master' into pegasus

16 files changed, 0 insertions, 48 deletions

diff --git a/audio/mods/infogrames.cpp b/audio/mods/infogrames.cpp
index 8bfffeacb6..5b4d39fe49 100644
--- a/audio/mods/infogrames.cpp
+++ b/audio/mods/infogrames.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "audio/mods/infogrames.h"
diff --git a/audio/mods/infogrames.h b/audio/mods/infogrames.h
index 9787210e82..307a26d4e1 100644
--- a/audio/mods/infogrames.h
+++ b/audio/mods/infogrames.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 /**
diff --git a/audio/mods/maxtrax.cpp b/audio/mods/maxtrax.cpp
index 0738966dab..953bb8f8d2 100644
--- a/audio/mods/maxtrax.cpp
+++ b/audio/mods/maxtrax.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/scummsys.h"
diff --git a/audio/mods/maxtrax.h b/audio/mods/maxtrax.h
index 2f890afe2d..bef6669d2a 100644
--- a/audio/mods/maxtrax.h
+++ b/audio/mods/maxtrax.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // see if all engines using this class are DISABLED
diff --git a/audio/mods/module.cpp b/audio/mods/module.cpp
index 987b17bc8d..8d09671d26 100644
--- a/audio/mods/module.cpp
+++ b/audio/mods/module.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "audio/mods/module.h"
diff --git a/audio/mods/module.h b/audio/mods/module.h
index c9b72bd2d6..a57a89225e 100644
--- a/audio/mods/module.h
+++ b/audio/mods/module.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SOUND_MODS_MODULE_H
diff --git a/audio/mods/paula.cpp b/audio/mods/paula.cpp
index ef841ac9bf..4b49d6e750 100644
--- a/audio/mods/paula.cpp
+++ b/audio/mods/paula.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "audio/mods/paula.h"
diff --git a/audio/mods/paula.h b/audio/mods/paula.h
index f6f159d5a6..cd797f51cb 100644
--- a/audio/mods/paula.h
+++ b/audio/mods/paula.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #ifndef SOUND_MODS_PAULA_H
diff --git a/audio/mods/protracker.cpp b/audio/mods/protracker.cpp
index f781920505..084b0edf9a 100644
--- a/audio/mods/protracker.cpp
+++ b/audio/mods/protracker.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "audio/mods/protracker.h"
diff --git a/audio/mods/protracker.h b/audio/mods/protracker.h
index fa9895b81f..15f708d801 100644
--- a/audio/mods/protracker.h
+++ b/audio/mods/protracker.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 /**
diff --git a/audio/mods/rjp1.cpp b/audio/mods/rjp1.cpp
index eaa99e6928..45c6caa106 100644
--- a/audio/mods/rjp1.cpp
+++ b/audio/mods/rjp1.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/debug.h"
diff --git a/audio/mods/rjp1.h b/audio/mods/rjp1.h
index e3cb0b853d..232b1926e9 100644
--- a/audio/mods/rjp1.h
+++ b/audio/mods/rjp1.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 /**
diff --git a/audio/mods/soundfx.cpp b/audio/mods/soundfx.cpp
index 44fdd65986..767d1ce9c8 100644
--- a/audio/mods/soundfx.cpp
+++ b/audio/mods/soundfx.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/endian.h"
diff --git a/audio/mods/soundfx.h b/audio/mods/soundfx.h
index 9dd5240160..48ccff2da6 100644
--- a/audio/mods/soundfx.h
+++ b/audio/mods/soundfx.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 /**
diff --git a/audio/mods/tfmx.cpp b/audio/mods/tfmx.cpp
index f7cfc50c10..afc7d3b40b 100644
--- a/audio/mods/tfmx.cpp
+++ b/audio/mods/tfmx.cpp
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 #include "common/scummsys.h"
diff --git a/audio/mods/tfmx.h b/audio/mods/tfmx.h
index 1930487eb8..2b07e2e660 100644
--- a/audio/mods/tfmx.h
+++ b/audio/mods/tfmx.h
@@ -18,9 +18,6 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $URL$
- * $Id$
- *
  */
 
 // see if all engines using this class are DISABLED