personal/stbuehler/wip
Thomas Porzelt 15 years ago
commit ea199724c3

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

Loading…
Cancel
Save