diff options
| author | Maxim Biro <nurupo.contributions@gmail.com> | 2013-08-07 19:18:40 -0400 |
|---|---|---|
| committer | Maxim Biro <nurupo.contributions@gmail.com> | 2013-08-07 19:18:40 -0400 |
| commit | f669b28a6ca3e7a0fc2fc7d5cb8e73dacea3866f (patch) | |
| tree | 9078bb4d991b17f12483b6e25a87d8600bde1df0 /docs | |
| parent | b1a2af23e521f1b21a1013c6894987f410700496 (diff) | |
| parent | 81fccf68d6ef0363599ce8ab14cf45f5f021e5d6 (diff) | |
Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core
Conflicts:
core/Messenger.c
core/Messenger.h
Diffstat (limited to 'docs')
0 files changed, 0 insertions, 0 deletions