1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-08 03:46:34 +01:00

Merge branch 'master' into new_groupchats

This commit is contained in:
Jfreegman
2015-03-21 15:15:48 -04:00
14 changed files with 107 additions and 89 deletions

View File

@@ -1026,6 +1026,7 @@ void DnD_callback(const char* asdv, DropType dt)
int main(int argc, char *argv[])
{
parse_args(argc, argv);
if (arg_opts.encrypt_data && arg_opts.unencrypt_data) {