Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-02-18 15:26:11 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-02-18 15:26:11 +0400
commit910f04ca6373510f463de2541576b479671dc2ef (patch)
tree544499dbbab4c371052e54cc1a32e7a60e64206a /source/blender/editors/space_console
parentf261d58b6dfd68ae936ed8b76c8399df7a34a071 (diff)
parentf3bef40b0cf2a10bcffedae6c5235e3f5537670f (diff)
Merged changes in the trunk up to revision 44221.
Conflicts resolved: release/datafiles/blender_icons.png source/blender/blenkernel/intern/anim_sys.c source/blender/blenloader/intern/readfile.c
Diffstat (limited to 'source/blender/editors/space_console')
-rw-r--r--source/blender/editors/space_console/console_intern.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_console/console_intern.h b/source/blender/editors/space_console/console_intern.h
index 1c7aef01450..ce5c5f81f63 100644
--- a/source/blender/editors/space_console/console_intern.h
+++ b/source/blender/editors/space_console/console_intern.h
@@ -24,8 +24,8 @@
* \ingroup spconsole
*/
-#ifndef ED_CONSOLE_INTERN_H
-#define ED_CONSOLE_INTERN_H
+#ifndef __CONSOLE_INTERN_H__
+#define __CONSOLE_INTERN_H__
/* internal exports only */
@@ -69,4 +69,4 @@ void CONSOLE_OT_select_set(struct wmOperatorType *ot);
enum { LINE_BEGIN, LINE_END, PREV_CHAR, NEXT_CHAR, PREV_WORD, NEXT_WORD };
enum { DEL_ALL, DEL_NEXT_CHAR, DEL_PREV_CHAR, DEL_SELECTION, DEL_NEXT_SEL, DEL_PREV_SEL };
-#endif /* ED_CONSOLE_INTERN_H */
+#endif /* __CONSOLE_INTERN_H__ */