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:
authorTon Roosendaal <ton@blender.org>2006-01-04 00:43:31 +0300
committerTon Roosendaal <ton@blender.org>2006-01-04 00:43:31 +0300
commitf47899fc0f716464625f43045458e222ce11603d (patch)
tree1051359e7eb24a5d40826a0ea7aaa925da7d92c0 /source/blender/include/BIF_space.h
parent9557c3a66dccc357f7a8cfecca8e23639208afd2 (diff)
parent14d5cd1c3145e6f7d6645e1d9623eb9d5d244ad9 (diff)
Orange; merger with bf-blender.
(Merging is *not* fun work, especially not with bugfixes in main branch for code that got cleaned up in the other! Poor Hos... :)
Diffstat (limited to 'source/blender/include/BIF_space.h')
-rw-r--r--source/blender/include/BIF_space.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/include/BIF_space.h b/source/blender/include/BIF_space.h
index 7970ed5e41d..8213192a2ae 100644
--- a/source/blender/include/BIF_space.h
+++ b/source/blender/include/BIF_space.h
@@ -115,6 +115,7 @@ extern void set_rects_butspace(struct SpaceButs *buts);
extern void test_butspace(void);
extern void start_game(void);
extern void select_grouped(short nr);
+extern void join_menu(void);
extern void BIF_undo_push(char *str);
extern void BIF_undo(void);