summaryrefslogtreecommitdiff
path: root/INSTALL.md
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-07-20 07:55:21 -0400
committerirungentoo <irungentoo@gmail.com>2013-07-20 07:55:21 -0400
commit11e94066f710a602a9a071b028036a2b35de2741 (patch)
tree0a6c037e40c0d8744516715c7b4e126d94e75841 /INSTALL.md
parent41cc5b19caae05fb751dc9b066b1ea98c263f585 (diff)
parenta72777ed70ed6bfcda8a532c52e0d64241a8bb71 (diff)
Merge branch 'master' of https://github.com/sometwo/ProjectTox-Core into sometwo-master
Conflicts: core/Messenger.c
Diffstat (limited to 'INSTALL.md')
0 files changed, 0 insertions, 0 deletions