From fd7c729bd17d8c1d8e98003d27e47a58c1c258ec Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Mon, 4 Feb 2008 21:52:03 +0000 Subject: This is patch: [#8216] Make blender compile with gcc 4.3 minus one small include file that was commented out, I'm not sure why it was commented out but I'm pretty sure its needed. If there are still problems later we can sort it out, everything else is pretty simple. Kent --- intern/string/STR_String.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern/string/STR_String.h') diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 2da2b57c6f2..7b02e6c1855 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -47,6 +47,10 @@ #include #include + +#include +#include + using namespace std; -- cgit v1.2.3 From 5d0a207ecb843c4c73be897cfccbf3a0d2db574b Mon Sep 17 00:00:00 2001 From: Chris Want Date: Wed, 16 Apr 2008 22:40:48 +0000 Subject: Patch from GSR that a) fixes a whole bunch of GPL/BL license blocks that were previously missed; and b) greatly increase my ohloh stats! --- intern/string/STR_String.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'intern/string/STR_String.h') diff --git a/intern/string/STR_String.h b/intern/string/STR_String.h index 7b02e6c1855..ec945c80c7c 100644 --- a/intern/string/STR_String.h +++ b/intern/string/STR_String.h @@ -1,14 +1,11 @@ /** * $Id$ - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GPL LICENSE BLOCK ***** * * 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. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * 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 @@ -26,7 +23,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ /** -- cgit v1.2.3