diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-01 06:47:59 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-01 06:47:59 +0400 |
| commit | ed0e2fbd9f4edd55e11df694b34e233cb38cb953 (patch) | |
| tree | 70a0d0fc080339b87cbeb73ebab6d4eda91ca5ba /release/datafiles | |
| parent | 129a29873e552d769339c2b7d3b99a0afbbf2ae0 (diff) | |
| parent | 75cce01a614e686530e26dbd186a88d75dc4e7b5 (diff) | |
Merged changes in the trunk up to revision 52690.
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenlib/intern/bpath.c
Diffstat (limited to 'release/datafiles')
| -rw-r--r-- | release/datafiles/startup.blend | bin | 417000 -> 425168 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/release/datafiles/startup.blend b/release/datafiles/startup.blend Binary files differindex 3d31f9cb758..49212f6f9cb 100644 --- a/release/datafiles/startup.blend +++ b/release/datafiles/startup.blend |