2
0
Fork 0
This commit is contained in:
Thomas Porzelt 2008-06-29 16:31:12 +02:00
parent ea199724c3
commit 3845759fd7
1 changed files with 0 additions and 6 deletions

View File

@ -1,8 +1,3 @@
<<<<<<< TREE
# test
# test 2
=======
void action_stack_init(action_stack* as)
{
// preallocate a stack of 15 elements
@ -161,4 +156,3 @@ gboolean condition_check_bool(condition* cond)
return FALSE;
}
}
>>>>>>> MERGE-SOURCE