Added .gitignore to ignore certain files + fixed access rights on Makefile* as

[quix0rs-blobwars.git] / src / pak.h

diff --git a/src/pak.h b/src/pak.h
index 51efe1bdf5c315b82739d3782b5d824d1b849477..e7800becec70e656761852000597efe2e1bc500a 100644 (file)
--- a/src/pak.h
+++ b/src/pak.h
@@ -1,5 +1,6 @@
 /*
-Copyright (C) 2004 Parallel Realities
+Copyright (C) 2004-2011 Parallel Realities
+Copyright (C) 2011-2015 Perpendicular Dimensions
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -21,3 +22,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <dirent.h>
 
 #include "headers.h"
+#ifdef FRAMEWORK_SDL
+#undef main
+#endif