git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.onelab.eu:/git/sface
[sface.git]
/
sface
/
screens
/
mainscreen.py
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
32d9849
..
00710a3
100644
(file)
--- a/
sface/screens/mainscreen.py
+++ b/
sface/screens/mainscreen.py
@@
-5,7
+5,7
@@
from PyQt4.QtGui import *
from sfa.util.rspecHelper import RSpec
from sface.sfahelper import *
from sfa.util.rspecHelper import RSpec
from sface.sfahelper import *
-from sface.
sfi
config import config
+from sface.config import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen