From 47b9603488cfb5fb95f85c1f5b770e91762135fe Mon Sep 17 00:00:00 2001
From: root <root@xo-05-29-F6.localdomain>
Date: Wed, 19 Sep 2007 21:39:41 +0000
Subject: Merge branch 'master' of git+ssh://olipet@dev.laptop.org/git/projects/tamtam

---
(limited to 'TamTamMini.activity/Mini/miniTamTamMain.py')

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 _
 
--
cgit v0.9.1