Merge branch 'master' of github.com:jeena/Bungloo

This commit is contained in:
jeena 2013-02-25 00:51:58 +01:00
commit 595d751449

View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python2
import os, sys, pickle, subprocess import os, sys, pickle, subprocess
from PyQt4 import QtCore, QtGui, QtWebKit from PyQt4 import QtCore, QtGui, QtWebKit