diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 16:43:08 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 16:43:08 +0400 |
commit | 15e6d6cd75fc484e7ac347d25826e7c3217e95a3 (patch) | |
tree | 0156ab8a78e8c4e65176cbb2b95319a6b832b533 /source/blenderplayer | |
parent | 70bf00a74c1688e857e3ca1b143b4d7a57a30655 (diff) | |
parent | 4a04f7206914a49f5f95adc5eb786237f1a9f547 (diff) |
svn merge ^/trunk/blender -r41226:41227 .
Diffstat (limited to 'source/blenderplayer')
-rw-r--r-- | source/blenderplayer/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
3 files changed, 0 insertions, 4 deletions
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 22da04c74f5..8442045b91f 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -1,5 +1,4 @@ # -*- mode: cmake; indent-tabs-mode: t; -*- -# $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt index 0610cf2fdbe..afd5f5b0177 100644 --- a/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt +++ b/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 74292dbf47a..94dc6a93cc4 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or |