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/gameengine/VideoTexture/ImageBuff.cpp | |
parent | 70bf00a74c1688e857e3ca1b143b4d7a57a30655 (diff) | |
parent | 4a04f7206914a49f5f95adc5eb786237f1a9f547 (diff) |
svn merge ^/trunk/blender -r41226:41227 .
Diffstat (limited to 'source/gameengine/VideoTexture/ImageBuff.cpp')
-rw-r--r-- | source/gameengine/VideoTexture/ImageBuff.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/gameengine/VideoTexture/ImageBuff.cpp b/source/gameengine/VideoTexture/ImageBuff.cpp index 44c4df7fae0..602ae3ddce9 100644 --- a/source/gameengine/VideoTexture/ImageBuff.cpp +++ b/source/gameengine/VideoTexture/ImageBuff.cpp @@ -1,7 +1,6 @@ /** \file gameengine/VideoTexture/ImageBuff.cpp * \ingroup bgevideotex */ -/* $Id$ ----------------------------------------------------------------------------- This source file is part of VideoTexture library |