Merge branch 'master' into divVerent/farplanedist-sky-fix

[xonotic/netradiant.git] / plugins / imagepng / plugin.h

diff --git a/plugins/imagepng/plugin.h b/plugins/imagepng/plugin.h
index c52b50bb53103f263240a4a0affe079c72f8af35..271a2ad27b87c85e7272161d0575419fc0b2e16d 100644 (file)
--- a/plugins/imagepng/plugin.h
+++ b/plugins/imagepng/plugin.h
@@ -1,31 +1,25 @@
 /*
-Copyright (C) 1999-2007 id Software, Inc. and contributors.
-For a list of contributors, see the accompanying CONTRIBUTORS file.
+   Copyright (C) 1999-2006 Id Software, Inc. and contributors.
+   For a list of contributors, see the accompanying CONTRIBUTORS file.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant 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.
+   GtkRadiant 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.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   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 GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
-#ifndef _PLUGIN_H_
-#define _PLUGIN_H_
+#if !defined( INCLUDED_PLUGIN_H )
+#define INCLUDED_PLUGIN_H
 
-#include "qerplugin.h"
-#include "iimage.h"
-#include "ifilesystem.h"
-
-void LoadImage (const char *filename, unsigned char **pic, int *width, int *height);
-
-#endif // _PLUGIN_H_
+#endif