From 822fffdd4413687494032cb65fe999485c803f98 Mon Sep 17 00:00:00 2001
From: Glenn Maynard <gmaynard@users.sourceforge.net>
Date: Sun, 23 May 2004 01:27:01 +0000
Subject: [PATCH] license update

---
 stepmania/src/MsdFile.cpp | 42 +++++++++++++++++++++++++++------------
 stepmania/src/MsdFile.h   | 40 ++++++++++++++++++++++++++-----------
 2 files changed, 57 insertions(+), 25 deletions(-)

diff --git a/stepmania/src/MsdFile.cpp b/stepmania/src/MsdFile.cpp
index b3f0ee4d28..b1a81199d6 100644
--- a/stepmania/src/MsdFile.cpp
+++ b/stepmania/src/MsdFile.cpp
@@ -1,17 +1,5 @@
-#include "global.h"
 /*
------------------------------------------------------------------------------
- Class: MsdFile
-
- Desc: See header.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
-	Glenn Maynard
------------------------------------------------------------------------------
-*/
-
-/* The original MSD format is simply:
+ * The original MSD format is simply:
  * 
  * #PARAM0:PARAM1:PARAM2:PARAM3;
  * #NEXTPARAM0:PARAM1:PARAM2:PARAM3;
@@ -27,6 +15,8 @@
  * colons and "//".  Also, we should escape #s, so if we really want to put a # at the
  * beginning of a line, we can. 
  */
+
+#include "global.h"
 #include "MsdFile.h"
 #include "RageLog.h"
 #include "RageUtil.h"
@@ -166,3 +156,29 @@ CString MsdFile::GetParam(unsigned val, unsigned par) const
 
 	return values[val].params[par];
 }
+
+/*
+ * (c) 2001-2004 Chris Danford, Glenn Maynard
+ *
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */
diff --git a/stepmania/src/MsdFile.h b/stepmania/src/MsdFile.h
index e498c7fc73..9af4deb20b 100644
--- a/stepmania/src/MsdFile.h
+++ b/stepmania/src/MsdFile.h
@@ -1,17 +1,7 @@
+/* MsdFile - Read and write .SM, .DWI, and .MSD files. */
+
 #ifndef MSDFILE_H
 #define MSDFILE_H
-/*
------------------------------------------------------------------------------
- Class: MsdFile
-
- Desc: Wrapper for reading and writing an .sm, .dwi, .or msd file.
-
- Copyright (c) 2001-2002 by the person(s) listed below.  All rights reserved.
-	Chris Danford
-	Glenn Maynard
------------------------------------------------------------------------------
-*/
-
 
 class MsdFile  
 {
@@ -46,3 +36,29 @@ private:
 };
 
 #endif
+
+/*
+ * (c) 2001-2004 Chris Danford, Glenn Maynard
+ *
+ * All rights reserved.
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, and/or sell copies of the Software, and to permit persons to
+ * whom the Software is furnished to do so, provided that the above
+ * copyright notice(s) and this permission notice appear in all copies of
+ * the Software and that both the above copyright notice(s) and this
+ * permission notice appear in supporting documentation.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+ * THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS
+ * INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT
+ * OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
+ * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ * PERFORMANCE OF THIS SOFTWARE.
+ */