svn merge -r36900:37028 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-31 05:11:04 +00:00
parent 38293a00c3 dcd55cef86
commit 08d6932c86
148 changed files with 12715 additions and 13509 deletions
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@ -42,7 +42,7 @@ extern "C" {

 /* these lines are grep'd, watch out for our not-so-awesome regex
 * and keep comment above the defines.
- * Use STRINGIFY() rather then defining with quotes */
+ * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION			257
 #define BLENDER_SUBVERSION		1