diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-09-17 03:54:33 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-09-17 03:54:33 +0400 |
| commit | 771bad9c6abaad4b742935e5d55067f281287650 (patch) | |
| tree | f5325241d866890ae7a155eb112019090dfbf05a /intern/cycles/kernel/geom/geom_triangle.h | |
| parent | 3cdfea119d93ea3d1ec5096cb7d218c7ae4991d5 (diff) | |
| parent | f0f398dcf3101079f4965185eb82c23c54fc6923 (diff) | |
Merge branch 'master' into soc-2014-viewport_context
Diffstat (limited to 'intern/cycles/kernel/geom/geom_triangle.h')
0 files changed, 0 insertions, 0 deletions