* Merging trunk up to r38981.

* Fixing a minor issue in a previous commit.
2011-08-03 12:44:52 +00:00
parent 6d7490632f f1fb54e126
commit eb9d591898
40 changed files with 500 additions and 286 deletions
--- a/doc/python_api/blender-org/static/default.css_t
+++ b/doc/python_api/blender-org/static/default.css_t
@@ -219,7 +219,7 @@ div.sphinxsidebarwrapper.fixed {
 }

 {%- if theme_stickysidebar|tobool %}
-/* this is nice, but it it leads to hidden headings when jumping
+/* this is nice, but it leads to hidden headings when jumping
   to an anchor */
 /*
 div.related {