diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-10-30 06:03:40 +0400 |
| commit | 65668dc5eb45ae6e90675aecc9dd6132dc7f0b5e (patch) | |
| tree | 355f3b4dd6f28dc0debf249d1c85a6474784dcfe /source/blender/CMakeLists.txt | |
| parent | 16702c172939a399ddd0e61fc14a8b0944c4249b (diff) | |
| parent | 15bd96efeb77cf33215613a53059f01db7242b31 (diff) | |
Merged changes in the trunk up to revision 41368.
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c
Diffstat (limited to 'source/blender/CMakeLists.txt')
| -rw-r--r-- | source/blender/CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index 1c0c071e398..24ad1e5aae7 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or |