emdee/toxygen
1
0
Fork 0
Code Issues 1 Pull Requests Actions Wiki Activity

Merge branch 'video' into develop

Browse Source 
Conflicts:
	.travis.yml
	toxygen/calls.py
	toxygen/loginscreen.py
	toxygen/util.py
This commit is contained in:
ingvar1995
2017-06-20 19:58:59 +03:00
parent a20a00130d 4d4fd21fe9
commit 43c71ec1a5
29 changed files with 1085 additions and 897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
toxygen/styles/style.py
View File

@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
try:
from PySide import QtCore
from PyQt5 import QtCore
except ImportError:
from PyQt4 import QtCore