diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-28 21:00:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-28 21:00:53 +0400 |
| commit | 46ae692710467d3622f58e0c5ce371674a6a7d9b (patch) | |
| tree | ebd27a8cc3adad65343a6a8d3d22ce02cad24db8 /release/datafiles | |
| parent | fae903e263fd11d788a4e55900ff25f4fc8b26db (diff) | |
| parent | 7627a742ab6e630522186b04a71fa40533d87db2 (diff) | |
Merge with trunk r41342
Diffstat (limited to 'release/datafiles')
| -rw-r--r-- | release/datafiles/LICENSE-bfont.ttf.txt | 1 | ||||
| -rw-r--r-- | release/datafiles/blender_icons.png (renamed from release/datafiles/blenderbuttons) | bin | 200029 -> 200029 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/blender_icons.png Binary files differindex c4fd5aaa93d..c4fd5aaa93d 100644 --- a/release/datafiles/blenderbuttons +++ b/release/datafiles/blender_icons.png |
