diff options
| author | irungentoo <irungentoo@gmail.com> | 2014-08-04 13:49:53 -0400 |
|---|---|---|
| committer | irungentoo <irungentoo@gmail.com> | 2014-08-04 13:49:53 -0400 |
| commit | aaaeac8f3d66d2888430b4c30b58f26e9f0e1011 (patch) | |
| tree | ccfcbf117742f274ce9552e875533fccee357621 /.travis.yml | |
| parent | d4218dcd6124751c5978183531db144398485a94 (diff) | |
| parent | d08d03236806cbc062968910983b92dc59763404 (diff) | |
Merge branch 'master' of https://github.com/mannol1/toxcore
Conflicts:
toxav/toxav.c
Diffstat (limited to '.travis.yml')
0 files changed, 0 insertions, 0 deletions