diff options
| author | irungentoo <irungentoo@gmail.com> | 2013-08-07 13:51:58 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2013-08-07 13:51:58 -0400 |
| commit | 59f873fd6842634bd589640c7d63e1e0e0ecefaf (patch) | |
| tree | 76370462b6c2f293d4fd1c37fa0ac1ee6b0dc68f /cmake | |
| parent | 5a8da17e61f59f189a8534f75d56c0e98f9caf39 (diff) | |
| parent | c0828667e70fdd92fd01c581ce04dfc451e01860 (diff) | |
Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests
Conflicts:
testing/toxic/chat.c
testing/toxic/prompt.c
Diffstat (limited to 'cmake')
0 files changed, 0 insertions, 0 deletions