diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-10-29 05:09:12 +0400 |
| commit | 15ed8343437c6b304de72cd14591455da1d5b3ec (patch) | |
| tree | cbe40f76668f5e8539744c4d2f8aeaa0ded72f52 /release/datafiles | |
| parent | 5acd5d14970c829c2873623716a67beeb6da5278 (diff) | |
| parent | dd106b5c7a129e00bebe121c4da8cb90a16d48cb (diff) | |
Merged changes in the trunk up to revision 51718.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_scene.c
release/datafiles/startup.blend
Diffstat (limited to 'release/datafiles')
| -rw-r--r-- | release/datafiles/blender_icons.png | bin | 209196 -> 228428 bytes |
| -rw-r--r-- | release/datafiles/prvicons.png | bin | 12311 -> 14130 bytes |
| -rw-r--r-- | release/datafiles/startup.blend | bin | 410612 -> 413008 bytes |
3 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/blender_icons.png b/release/datafiles/blender_icons.png Binary files differindex 09a63f4c47d..55a83964a8b 100644 --- a/release/datafiles/blender_icons.png +++ b/release/datafiles/blender_icons.png diff --git a/release/datafiles/prvicons.png b/release/datafiles/prvicons.png Binary files differindex 364d9678f0b..dc31964b33f 100644 --- a/release/datafiles/prvicons.png +++ b/release/datafiles/prvicons.png diff --git a/release/datafiles/startup.blend b/release/datafiles/startup.blend Binary files differindex dee58249bde..f8d722a0d91 100644 --- a/release/datafiles/startup.blend +++ b/release/datafiles/startup.blend |
