Merge with master (V0.11.1)

Makefile

@@ -12,9 +12,9 @@ CFLAGS += ${USER_CFLAGS}
 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
 
 # Check if debug build is enabled

src/windows.c

@@ -1142,7 +1142,7 @@ void kill_all_windows(Tox *m)
             case WINDOW_TYPE_GROUPCHAT: {
                 exit_groupchat(w, m, w->num, user_settings->group_part_message,
                                strlen(user_settings->group_part_message));
-		break;
+                break;
             }
 
             default: {