Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TamTamMini.activity/Mini/miniTamTamMain.py
diff options
context:
space:
mode:
authorroot <root@xo-05-29-F6.localdomain>2007-09-19 21:39:41 (GMT)
committer root <root@xo-05-29-F6.localdomain>2007-09-19 21:39:41 (GMT)
commit47b9603488cfb5fb95f85c1f5b770e91762135fe (patch)
tree8d086d314af2cf14148a272f1b650e2b35756871 /TamTamMini.activity/Mini/miniTamTamMain.py
parent287a14f9dba1f935cb5673ed6b92aad5ba0b6723 (diff)
parent75dcef4ab8b11d78a4547e8027ae0905a47dbf97 (diff)
Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam
Diffstat (limited to 'TamTamMini.activity/Mini/miniTamTamMain.py')
-rw-r--r--TamTamMini.activity/Mini/miniTamTamMain.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/TamTamMini.activity/Mini/miniTamTamMain.py b/TamTamMini.activity/Mini/miniTamTamMain.py
index 810d3e4..c2b84eb 100644
--- a/TamTamMini.activity/Mini/miniTamTamMain.py
+++ b/TamTamMini.activity/Mini/miniTamTamMain.py
@@ -14,7 +14,7 @@ from common.Util.NoteDB import PARAMETER
import common.Util.Network as Net
-import common.Config as Config
+import Config
from Mini.miniToolbars import playToolbar
from Mini.miniToolbars import recordToolbar
@@ -31,7 +31,7 @@ from MiniSequencer import MiniSequencer
from Loop import Loop
from RythmGenerator import *
from common.Util.Trackpad import Trackpad
-from common.Util.InstrumentPanel import InstrumentPanel
+from Mini.InstrumentPanel import InstrumentPanel
from gettext import gettext as _