diff options
author | Daniel Genrich <daniel.genrich@gmx.net> | 2008-05-07 21:44:46 +0400 |
---|---|---|
committer | Daniel Genrich <daniel.genrich@gmx.net> | 2008-05-07 21:44:46 +0400 |
commit | 57932e1752ea0d9b9b0f3f69327bca83297d7e07 (patch) | |
tree | 0ee57c9d36089c68113e0db92fa2b8c915c5bf14 /source/gameengine/GamePlayer/ghost/GPG_Application.h | |
parent | 2f4ca518ea468f6c2e06a70aa24f16cf8a141425 (diff) | |
parent | 529a8bb949412ac5cc7203fd583e4f0b28282ddf (diff) |
svn merge -r 13452:14721 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/GamePlayer/ghost/GPG_Application.h')
-rw-r--r-- | source/gameengine/GamePlayer/ghost/GPG_Application.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/gameengine/GamePlayer/ghost/GPG_Application.h b/source/gameengine/GamePlayer/ghost/GPG_Application.h index 11ede4d51ca..024ca1dbf32 100644 --- a/source/gameengine/GamePlayer/ghost/GPG_Application.h +++ b/source/gameengine/GamePlayer/ghost/GPG_Application.h @@ -1,15 +1,12 @@ /** * $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 @@ -27,7 +24,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** * GHOST Blender Player application declaration file. */ |