This repository has been archived on 2023-10-09. You can view files and clone it, but cannot push or open issues or pull requests.

Tamito Kajiyama dd8e836067 Merged changes in the trunk up to revision 51853. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c

This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!

2012-11-04 02:22:56 +00:00

..

blender-org

fix [#28151] export OBJ don't save the extension

2011-08-03 05:32:07 +00:00

epy

hide overly picky warnings from 'pylint' for pep8 script, indentation edits.

2011-11-19 16:17:35 +00:00

examples

* Fix small bug in Python operator example; improved example of modal operator

2012-10-12 18:19:39 +00:00

rst

style cleanup

2012-10-27 10:42:28 +00:00

sphinx_changelog_gen.py

api changelog for 2.64 and 2.63 (which I missed last release)

2012-10-09 01:07:08 +00:00

sphinx_doc_gen.py

Merged changes in the trunk up to revision 51853.

2012-11-04 02:22:56 +00:00

sphinx_doc_gen.sh

minor fixes

2012-06-11 12:13:41 +00:00