Missing updates in the doc/ and intern/ folders during the merger in revision 55847.
[blender.git] / doc / manpage /
drwxr-xr-x   ..
-rw-r--r-- 8612 blender.1
-rw-r--r-- 4124 blender.1.py