Merged changes in the trunk up to revision 45820.

Conflicts resolved: source/creator/creator.c
2012-04-21 00:33:36 +00:00
parent 4a19ccfa5f 15eb3452ec
commit cdbfd1db38
272 changed files with 5403 additions and 3771 deletions
--- a/doc/python_api/sphinx_doc_gen.py
+++ b/doc/python_api/sphinx_doc_gen.py
@@ -131,7 +131,7 @@ def handle_args():
                        dest="sphinx_theme",
                        type=str,
                        default='default',
-                        help =
+                        help=
                        # see SPHINX_THEMES below
                        "Sphinx theme (default='default')\n"
                        "Available themes\n"