Merged changes from branches/supertux-milestone2-grumbel/ to trunk/supertux/

[supertux.git] / src / scripting / squirrel_error.hpp

diff --git a/src/scripting/squirrel_error.hpp b/src/scripting/squirrel_error.hpp
index f56ef5d..256b323 100644 (file)
--- a/src/scripting/squirrel_error.hpp
+++ b/src/scripting/squirrel_error.hpp
@@ -1,12 +1,10 @@
-//  $Id$
-//
 //  SuperTux
 //  Copyright (C) 2006 Matthias Braun <matze@braunis.de>
 //
-//  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 (at your option) any later version.
+//  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 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
@@ -14,17 +12,15 @@
 //  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/>.
 
-#ifndef __SQUIRREL_ERROR_HPP__
-#define __SQUIRREL_ERROR_HPP__
+#ifndef HEADER_SUPERTUX_SCRIPTING_SQUIRREL_ERROR_HPP
+#define HEADER_SUPERTUX_SCRIPTING_SQUIRREL_ERROR_HPP
 
 #include <squirrel.h>
 #include <stdexcept>
 
-namespace Scripting
-{
+namespace Scripting {
 
 /** Exception class for squirrel errors, it takes a squirrelvm and uses
  * sq_geterror() to retrieve additional information about the last error that
@@ -44,3 +40,5 @@ private:
 }
 
 #endif
+
+/* EOF */