Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-25 10:26:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/welcor/tbamud

Browse source 
Conflicts:
	src/interpreter.c
This commit is contained in:
Rumble 2014-08-28 22:50:03 -05:00
commit 43d7f71c10
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/interpreter.c
View file

@ -699,7 +699,11 @@ static void perform_complex_alias(struct txt_q *input_q, char *orig, struct alia
write_point += strlen(tokens[num]);
} else if (*temp == ALIAS_GLOB_CHAR) {
skip_spaces(&orig);
<<<<<<< HEAD
strcpy(write_point, orig); /* strcpy: OK */
=======
strcpy(write_point, orig); /* strcpy: OK */
>>>>>>> f81cf2451717859aecaebb3ca07daf7b9d9a45a5
write_point += strlen(orig);
} else if ((*(write_point++) = *temp) == '$') /* redouble $ for act safety */
*(write_point++) = '$';