release/scripts/startup/bl_ui/properties_render.py · 39f0fbef95894031c9122aa86bcd6eb5edf834f5 · blender / blender-embree3 · GitLab

Snippets Groups Projects

12 years ago
5524ed9b
Merged changes in the trunk up to revision 55700. · 5524ed9b
Tamito Kajiyama authored 12 years ago
```
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
```
5524ed9b

History
Merged changes in the trunk up to revision 55700.
Tamito Kajiyama authored 12 years ago
```
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
```