diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 00:26:54 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-22 00:26:54 +0400 |
| commit | 9adfa289e800a52a7c4a47ea3ee8dcdf5b50f9c2 (patch) | |
| tree | 5afda3e9a0463fd4fb7f502281bb41a36ff1d1a7 /release | |
| parent | 10af15b85b743a18215a1fc58799264b5c798403 (diff) | |
| parent | 932aa116df985d21114dcad8c2518f69f8a6a39e (diff) | |
Cycles: svn merge -r41157:41182 ^/trunk/blender
Diffstat (limited to 'release')
| -rw-r--r-- | release/bin/.blender/.bfont.ttf | bin | 65932 -> 0 bytes |
| -rw-r--r-- | release/datafiles/fonts/droidsans.ttf.gz (renamed from release/bin/.blender/fonts/droidsans.ttf.gz) | bin | 2263650 -> 2263650 bytes |
2 files changed, 0 insertions, 0 deletions
diff --git a/release/bin/.blender/.bfont.ttf b/release/bin/.blender/.bfont.ttf Binary files differdeleted file mode 100644 index 58cd6b5e61e..00000000000 --- a/release/bin/.blender/.bfont.ttf +++ /dev/null diff --git a/release/bin/.blender/fonts/droidsans.ttf.gz b/release/datafiles/fonts/droidsans.ttf.gz Binary files differindex a00f35f3a66..a00f35f3a66 100644 --- a/release/bin/.blender/fonts/droidsans.ttf.gz +++ b/release/datafiles/fonts/droidsans.ttf.gz |