1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-10 21:43:02 +01:00

Merge with master (V0.11.1)

This commit is contained in:
jfreegman 2021-06-28 20:26:46 -04:00
parent 2c51afd9ef
commit 535a8402d6
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 4 additions and 4 deletions

View File

@ -12,9 +12,9 @@ CFLAGS += ${USER_CFLAGS}
LDFLAGS ?= LDFLAGS ?=
LDFLAGS += ${USER_LDFLAGS} LDFLAGS += ${USER_LDFLAGS}
OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o configdir.o curl_util.o execute.o OBJ = autocomplete.o avatars.o bootstrap.o chat.o chat_commands.o conference.o configdir.o curl_util.o execute.o
OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o conference.o help.o input.o line_info.o OBJ += file_transfers.o friendlist.o global_commands.o conference_commands.o groupchats.o groupchat_commands.o help.o
OBJ += log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o OBJ += input.o line_info.o log.o message_queue.o misc_tools.o name_lookup.o notify.o prompt.o qr_code.o settings.o
OBJ += term_mplex.o toxic.o toxic_strings.o windows.o OBJ += term_mplex.o toxic.o toxic_strings.o windows.o
# Check if debug build is enabled # Check if debug build is enabled