toxcore-git: Resolved merge conflicts as requested by Gottox
This commit is contained in:
parent
2f3bf68b32
commit
da14c60ccd
3 changed files with 36 additions and 0 deletions
|
@ -1960,3 +1960,7 @@ libusbredirhost.so.1 usbredir-0.7_1
|
|||
libprotobuf-c.so.1 protobuf-c-1.1.0_1
|
||||
libutf8proc.so.1 libutf8proc-1.1.6_1
|
||||
libnsutils.so.0 libnsutils-0.0.1_1
|
||||
libtoxcore.so.0 toxcore-git-20150313_1
|
||||
libtoxencryptsave.so.0 toxcore-git-20150313_1
|
||||
libtoxdns.so.0 toxcore-git-20150313_1
|
||||
libtoxav.so.0 toxcore-git-20150313_1
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue