diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-08-06 13:53:38 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-08-06 13:53:38 -0400 |
| commit | fc5a2f53df06bfba185ad9868970e1fecfa0fc06 (patch) | |
| tree | 549191f8bd33eabefabf6387ec1cf5aabfe49f59 /testing | |
| parent | eacd12385fc775c3c246a1586047d6c2e0166977 (diff) | |
| parent | 6e610749ebfc0bfe153ab88bcf76f4f9b24ff3fa (diff) | |
Merge branch 'master' of https://github.com/plutooo/ProjectTox-Core into plutooo-master
Conflicts:
core/ping.c
core/util.c
Diffstat (limited to 'testing')
0 files changed, 0 insertions, 0 deletions