1
0
mirror of https://github.com/Tha14/toxic.git synced 2026-01-30 08:33:16 +01:00

merge wit upstream

This commit is contained in:
Jfreegman
2015-03-11 18:52:28 -04:00
16 changed files with 569 additions and 35 deletions

View File

@@ -87,7 +87,7 @@ void get_time_str(char *buf, int bufsize)
return;
}
const char *t = user_settings->time == TIME_12 ? "%I:%M:%S " : "%H:%M:%S ";
const char *t = user_settings->timestamp_format;
strftime(buf, bufsize, t, get_time());
}