Missing brace
Resolve conflict
Merge branch 'olologin-master'
Remove temp file from editor that shouldnt have been added
Merge branch 'master' of https://github.com/olologin/jToxcore into olologin-master
Merge branch 'olologin-master'
Make ToxOptions more conventional with getters/setter
Remove deprecated tox_send_message_withid function. Use the return value of the other sendMessage function instead
Add libtoxav cmake file
Change constructor to require some booleans
Add java docs to new constructor
Merge branch 'master' of https://github.com/olologin/jToxcore into olologin-master
Merge branch 'olologin-master'
Merge branch 'master' of https://github.com/olologin/jToxcore into olologin-master
Merge branch 'olologin-master'
Merge remote-tracking branch 'jToxCore/master'
Fixed segfault in codec_settings_to_native