diff options
| author | Coren[m] <Break@Ocean> | 2013-10-24 22:47:23 +0200 |
|---|---|---|
| committer | Coren[m] <Break@Ocean> | 2013-10-24 22:47:23 +0200 |
| commit | 065495cd7c269389af7f834e568d12105589dd97 (patch) | |
| tree | c38eb6cfd8117b9a721b5d41144502736ed18bac /toxcore/Makefile.inc | |
| parent | 0a4c3d7e2e080dafd66d25f7a5806b89f7be1bcf (diff) | |
| parent | f3be5609049d278ee3f46754ea4b0eb929876dba (diff) | |
Merge remote-tracking branch 'upstream/master' into cleanup_unix_time_id_eq_cpy_is_timeout
Conflicts:
toxcore/net_crypto.c
Diffstat (limited to 'toxcore/Makefile.inc')
0 files changed, 0 insertions, 0 deletions