diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-26 06:32:34 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-11-26 06:32:34 +0400 |
| commit | 53840c7db5114da8b35fb12c1cfa49427802b0d7 (patch) | |
| tree | e1676e61881c903baff02bd69290ef0393a13465 /source/creator | |
| parent | b7cd9ec3ada529bf1d57cf08cc96851ceb67a47d (diff) | |
| parent | 97b8a1f752fbe729c20c8398dfa9fdbc2e2e4ff3 (diff) | |
Merged changes in the trunk up to revision 52546.
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/idcode.c
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/blender.map | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/source/creator/blender.map b/source/creator/blender.map new file mode 100644 index 00000000000..dc7bc3151e8 --- /dev/null +++ b/source/creator/blender.map @@ -0,0 +1,11 @@ + +/* on Linux we exclude LLVM symbols, they conflict with Mesa llvmpipe */ + +{ +global: + *; +local: + *llvm*; + *LLVM*; +}; + |