Merging r44140 through r44226 from trunk into soc-2011-tomato

2012-02-18 16:12:22 +00:00
parent 62d09c9103 e6b708b36b
commit 746e712f7a
741 changed files with 7368 additions and 6833 deletions
--- a/source/blender/editors/include/ED_clip.h
+++ b/source/blender/editors/include/ED_clip.h
@@ -28,8 +28,8 @@
 *  \ingroup editors
 */

-#ifndef ED_MOVIECLIP_H
-#define ED_MOVIECLIP_H
+#ifndef __ED_CLIP_H__
+#define __ED_CLIP_H__

 struct ARegion;
 struct bContext;