blender/release/scripts
Bastien Montagne fa5a5af5df Revert own r60813, should never have been made here!
svn merge -c -60813 .
2013-10-19 14:32:29 +00:00
..
freestyle svn merge ^/trunk/blender -c60579 -c60599 -c60605 -c60626 -c60630 -c60635 -c60639 -c60644 -c60649 -c60673 -c60674 -c60675 -c60680 -c60682 -c60683 -c60685 -c60689 -c60695 -c60703 -c60707 -c60708 -c60709 -c60712 -c60712 -c60723 -c60724 -c60731 -c60740 -c60742 -c60743 -c60747 -c60749 -c60752 -c60753 -c60753 -c60755 2013-10-14 20:21:27 +00:00
modules Revert own r60813, should never have been made here! 2013-10-19 14:32:29 +00:00
presets rename presets not to use '+' character, also some typo fixes. 2013-10-05 14:19:39 +00:00
startup svn merge ^/trunk/blender -c60579 -c60599 -c60605 -c60626 -c60630 -c60635 -c60639 -c60644 -c60649 -c60673 -c60674 -c60675 -c60680 -c60682 -c60683 -c60685 -c60689 -c60695 -c60703 -c60707 -c60708 -c60709 -c60712 -c60712 -c60723 -c60724 -c60731 -c60740 -c60742 -c60743 -c60747 -c60749 -c60752 -c60753 -c60753 -c60755 2013-10-14 20:21:27 +00:00
templates_osl Cycles / Toon BSDF: 2013-05-23 17:45:20 +00:00
templates_py Fix broken example, reported by Codemanx on IRC, thanks. 2013-09-29 14:57:47 +00:00