Commit graph

10 commits

Author SHA1 Message Date
ingvar1995
43c71ec1a5 Merge branch 'video' into develop
Conflicts:
	.travis.yml
	toxygen/calls.py
	toxygen/loginscreen.py
	toxygen/util.py
2017-06-20 19:58:59 +03:00
ingvar1995
6cbacef95b travis.yml fix 2017-06-18 17:48:32 +03:00
ingvar1995
a20a00130d email notifications disabled 2017-06-11 22:58:11 +03:00
ingvar1995
d0e2f61d03 merge with pyqt5 branch and video sending 2017-06-11 15:35:52 +03:00
ingvar1995
05e4184c5d travis fix 2017-02-20 22:03:35 +03:00
ingvar1995
b807daa3ff fix travis 2016-10-22 22:56:18 +03:00
ingvar1995
a83cd65f79 opus + vpx travis 2016-10-22 22:52:56 +03:00
ingvar1995
476f074d6a libtoxav in tests and fix 2016-10-22 22:47:10 +03:00
ingvar1995
821dce5f28 tests update 2016-10-22 22:21:26 +03:00
ingvar1995
9ed62d4414 travis 2016-07-28 23:21:57 +03:00