Merge branch 'master' into blender2.8

This commit is contained in:
Sergey Sharybin
2017-09-25 18:56:34 +05:00
74 changed files with 176 additions and 2186 deletions

View File

@@ -160,9 +160,6 @@
* merged in docs.
*/
/** \defgroup quicktime QuickTime
* \ingroup blender
/** \defgroup gui GUI */
/** \defgroup wm Window Manager