Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12'

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

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