diff options
| author | Coren[m] <Break@Ocean> | 2013-09-16 09:29:08 +0200 |
|---|---|---|
| committer | Coren[m] <Break@Ocean> | 2013-09-16 09:29:08 +0200 |
| commit | 57d10f0a805b606c6f2df81879f71de0ed09dd96 (patch) | |
| tree | 36ad8501efabe2ac85ed2f69aa5f0cd2fc4ffdab /INSTALL | |
| parent | a341b259b6342962e209f1b50708abe40f1cdad2 (diff) | |
| parent | 7a69f2de287747eb31e143fd502951dd7d4ab2de (diff) | |
Merge remote-tracking branch 'upstream/master' into MessengerLoadSave
Conflicts:
toxcore/Messenger.c
toxcore/util.c
toxcore/util.h
Diffstat (limited to 'INSTALL')
0 files changed, 0 insertions, 0 deletions