diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-25 02:32:00 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-25 02:32:00 +0400 |
commit | 4cd1e6337e516015383f3c47886b180ee16d2e3a (patch) | |
tree | 0e953e863fabc88fb1954d24c8ccb08306a8e243 /CMakeLists.txt | |
parent | 55ab66b45582f4973a0ba13b2573c8d5f6990652 (diff) | |
parent | c49cdf5eec1ec70008c12f7b6cbfdad75dde3b16 (diff) |
Cycles: svn merge -r41225:41232 ^/trunk/blender
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7e1a52a9c6..9b78ff67461 100644 --- a/CMakeLists.txt +++ b/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 |