misc changes from trunk (avoid confusion since these were not intentional differences)
[blender-staging.git] / doc / manpage /
drwxr-xr-x   ..
-rw-r--r-- 7918 blender.1
-rw-r--r-- 4124 blender.1.py