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 /release/datafiles | |
| 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 'release/datafiles')
| -rw-r--r-- | release/datafiles/LICENSE-bfont.ttf.txt | 1 | ||||
| -rw-r--r-- | release/datafiles/blenderbuttons | bin | 214916 -> 0 bytes |
2 files changed, 0 insertions, 1 deletions
diff --git a/release/datafiles/LICENSE-bfont.ttf.txt b/release/datafiles/LICENSE-bfont.ttf.txt index 754089661b0..4aa22365c83 100644 --- a/release/datafiles/LICENSE-bfont.ttf.txt +++ b/release/datafiles/LICENSE-bfont.ttf.txt @@ -98,4 +98,3 @@ dealings in this Font Software without prior written authorization from Tavmjong Bah. For further information, contact: tavmjong @ free . fr. -$Id$ diff --git a/release/datafiles/blenderbuttons b/release/datafiles/blenderbuttons Binary files differdeleted file mode 100644 index a68a1f8394c..00000000000 --- a/release/datafiles/blenderbuttons +++ /dev/null |